tor

commit 3bca705c544bd56ade5a25022b51d395f038444f
parent 6e3ec8222c6b2b3eec332ef3b5d3b0eac0c00ce5
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri,  1 Dec 2017 12:13:40 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

Diffstat:
A
changes/bug24480
 | 
3
+++
M
src/or/rendservice.c
 | 
2
+-

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/changes/bug24480 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
@@ -1879,7 +1879,7 @@ rend_service_receive_introduction(origin_circuit_t *circuit,
   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) {