diff --git a/extern/redis-3.2.11/deps/lua/src/lparser.c b/extern/redis-3.2.11/deps/lua/src/lparser.c
index dda7488dc..ee7d90c90 100644
--- a/extern/redis-3.2.11/deps/lua/src/lparser.c
+++ b/extern/redis-3.2.11/deps/lua/src/lparser.c
@@ -384,13 +384,17 @@ Proto *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff, const char *name) {
   struct LexState lexstate;
   struct FuncState funcstate;
   lexstate.buff = buff;
-  luaX_setinput(L, &lexstate, z, luaS_new(L, name));
+  TString *tname = luaS_new(L, name);
+  setsvalue2s(L, L->top, tname);
+  incr_top(L);
+  luaX_setinput(L, &lexstate, z, tname);
   open_func(&lexstate, &funcstate);
   funcstate.f->is_vararg = VARARG_ISVARARG;  /* main func. is always vararg */
   luaX_next(&lexstate);  /* read first token */
   chunk(&lexstate);
   check(&lexstate, TK_EOS);
   close_func(&lexstate);
+  --L->top;
   lua_assert(funcstate.prev == NULL);
   lua_assert(funcstate.f->nups == 0);
   lua_assert(lexstate.fs == NULL);
diff --git a/extern/redis-3.2.11/deps/lua/src/lua_bit.c b/extern/redis-3.2.11/deps/lua/src/lua_bit.c
index 690df7d3c..a459ca98b 100644
--- a/extern/redis-3.2.11/deps/lua/src/lua_bit.c
+++ b/extern/redis-3.2.11/deps/lua/src/lua_bit.c
@@ -131,6 +131,7 @@ static int bit_tohex(lua_State *L)
   const char *hexdigits = "0123456789abcdef";
   char buf[8];
   int i;
+  if (n == INT32_MIN) n = INT32_MIN+1;
   if (n < 0) { n = -n; hexdigits = "0123456789ABCDEF"; }
   if (n > 8) n = 8;
   for (i = (int)n; --i >= 0; ) { buf[i] = hexdigits[b & 15]; b >>= 4; }
diff --git a/extern/redis-3.2.11/tests/unit/scripting.tcl b/extern/redis-3.2.11/tests/unit/scripting.tcl
index 68e136fd6..560bc2a8a 100644
--- a/extern/redis-3.2.11/tests/unit/scripting.tcl
+++ b/extern/redis-3.2.11/tests/unit/scripting.tcl
@@ -337,6 +337,12 @@ start_server {tags {"scripting"}} {
         set e
     } {*ERR*attempted to create global*}
 
+    test {lua bit.tohex bug} {
+        set res [run_script {return bit.tohex(65535, -2147483648)} 0]
+        r ping
+        set res
+    } {0000FFFF}
+
     test {Test an example script DECR_IF_GT} {
         set decr_if_gt {
             local current