Merge remote branch 'origin/maint-0.2.2'

changes/bug2324

@@ -0,0 +1,4 @@
+  o Minor bugfixes
+    - Add a check for SIZE_T_MAX to tor_realloc to try to avoid
+      underflow errors there too.  Fixes bug 2324.
+

src/common/util.c

@@ -175,6 +175,8 @@ _tor_realloc(void *ptr, size_t size DMALLOC_PARAMS)
 {
   void *result;
 
+  tor_assert(size < SIZE_T_CEILING);
+
 #ifdef USE_DMALLOC
   result = dmalloc_realloc(file, line, ptr, size, DMALLOC_FUNC_REALLOC, 0);
 #else