Merge branch 'maint-0.2.5' into release-0.2.5
This commit is contained in:
commit
20ca62ffb5
|
@ -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.
|
|
@ -1162,7 +1162,7 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request,
|
||||||
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) {
|
||||||
|
|
Loading…
Reference in New Issue