Merge branch 'maint-0.3.0' into maint-0.3.1

This commit is contained in:
Nick Mathewson
2017-12-01 12:13:40 -05:00
2 changed files with 4 additions and 1 deletions
+1 -1
View File
@@ -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) {