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
commitb86c9acac360c23749f007c29f1bdd7b8347c18d (patch)
treef2e28670b282814c0d9bbbda61a3873440e3cb12 /src/or/rendservice.c
parent909c91049a424776c563363312f93dcdc4cdb241 (diff)
parent5c03bb7c0ca55a17dae64d4a9d05dd88b3d712c8 (diff)
downloadtor-b86c9acac360c23749f007c29f1bdd7b8347c18d.tar.gz
tor-b86c9acac360c23749f007c29f1bdd7b8347c18d.zip
Merge branch 'maint-0.3.1' into maint-0.3.2
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 f6ce907637..2cdafa6666 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1829,7 +1829,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) {