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

Conflicts:
	src/common/torint.h

diff --cc src/common/crypto.c
Simple merge

diff --cc src/common/torint.h
index f5bebf8b9de2a23a40af072d97c40171d479184d,d4896846561b8233a1fbb4c7bc0a40902e1b9ea1..0b5c29adc009d7382fc2e14a972157e154710543
--- 1/src/common/torint.h
--- 2/src/common/torint.h
+++ b/src/common/torint.h
@@@ -329,8 -330,10 +329,10 @@@ typedef uint32_t uintptr_t
  #endif
  #endif
  
 -/* Any ssize_t larger than this amount is likely to be an underflow. */
++/** Any ssize_t larger than this amount is likely to be an underflow. */
+ #define SSIZE_T_CEILING ((ssize_t)(SSIZE_T_MAX-16))
 -/* Any size_t larger than this amount is likely to be an underflow. */
 +/** Any size_t larger than this amount is likely to be an underflow. */
- #define SIZE_T_CEILING (SSIZE_T_MAX-16)
+ #define SIZE_T_CEILING  ((size_t)(SSIZE_T_MAX-16))
  
  #endif /* __TORINT_H */