diff --git a/changes/bug2324 b/changes/bug2324
new file mode 100644
index 0000000000..eefc8370ef
--- /dev/null
+++ b/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.
+
diff --git a/src/common/util.c b/src/common/util.c
index 2b1430c9f2..7a24df8133 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -167,6 +167,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