Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

diff --cc src/common/torint.h
index f624bff86ea28dcbe4d3b6ae961eb6c7aa15d326,2a9fba6fcf7846de1949102a15195c83b48019aa..1faf65ababdd8a5c6de4871e4b466994554cef76
--- 1/src/common/torint.h
--- 2/src/common/torint.h
+++ b/src/common/torint.h
@@@ -115,8 -115,10 +115,8 @@@ typedef unsigned int uint32_t
  #define UINT32_MAX 0xffffffffu
  #endif
  #ifndef INT32_MAX
- #define INT32_MAX 0x7fffffffu
+ #define INT32_MAX 0x7fffffff
  #endif
 -#endif
 -
  #ifndef INT32_MIN
  #define INT32_MIN (-2147483647-1)
  #endif