nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.5' into maint-0.2.8

Browse Source
This commit is contained in:
Nick Mathewson 2017-12-01 12:13:39 -05:00
commit f97f301b5b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug24480 Normal file
View File

@ -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.

2
src/or/rendservice.c
View File

@ -1469,7 +1469,7 @@ rend_service_receive_introduction(origin_circuit_t *circuit,
time_t now = time(NULL); time_t now = time(NULL);
time_t elapsed; time_t elapsed;
int replay; int replay;
size_t keylen; ssize_t keylen;
/* Do some initial validation and logging before we parse the cell */ /* Do some initial validation and logging before we parse the cell */
if (circuit->base_.purpose != CIRCUIT_PURPOSE_S_INTRO) { if (circuit->base_.purpose != CIRCUIT_PURPOSE_S_INTRO) {