summaryrefslogtreecommitdiff
path: root/src/or/rendservice.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-12-01 12:13:40 -0500
committerNick Mathewson <nickm@torproject.org>2017-12-01 12:13:40 -0500
commit5c03bb7c0ca55a17dae64d4a9d05dd88b3d712c8 (patch)
tree7671e6ff03b528a78b4b059910f8767a036b857f /src/or/rendservice.c
parent7fae562a4da62090817f8546e8f4a8a29dcf1c4a (diff)
parent3bca705c544bd56ade5a25022b51d395f038444f (diff)
downloadtor-5c03bb7c0ca55a17dae64d4a9d05dd88b3d712c8.tar.gz
tor-5c03bb7c0ca55a17dae64d4a9d05dd88b3d712c8.zip
Merge branch 'maint-0.3.0' into maint-0.3.1
Diffstat (limited to 'src/or/rendservice.c')
-rw-r--r--src/or/rendservice.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index b2427342da..b1e8a2f0cd 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1946,7 +1946,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) {