diff --git a/changes/bug24480 b/changes/bug24480
new file mode 100644
index 000000000..94e5b91a0
--- /dev/null
+++ b/changes/bug24480
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation):
+    - Fix a signed/unsigned comparison warning introduced by our
+      fix to TROVE-2017-009. Fixes bug 24480; bugfix on 0.2.5.16.
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index ba8891ead..80e1e10a0 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1162,7 +1162,7 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request,
   time_t now = time(NULL);
   time_t elapsed;
   int replay;
-  size_t keylen;
+  ssize_t keylen;
 
   /* Do some initial validation and logging before we parse the cell */
   if (circuit->base_.purpose != CIRCUIT_PURPOSE_S_INTRO) {