mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'maint-0.3.2'

Browse source
This commit is contained in:
Nick Mathewson 2017-11-15 14:25:25 -05:00
commit ceeacc734d
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changes/bug23662 Normal file
View file

@ -0,0 +1,4 @@
o Minor bugfixes (onion services):
- Silence a warning about failed v3 onion descriptor uploads since it can
happen naturally under certain edge-cases. Fixes part of bug 23662;
bugfix on 0.3.2.1-alpha.

9
src/or/directory.c
View file

@ -3337,10 +3337,11 @@ handle_response_upload_hsdesc(dir_connection_t *conn,
/* XXX: Trigger control event. */
break;
case 400:
log_warn(LD_REND, "Uploading hidden service descriptor: http "
"status 400 (%s) response from dirserver "
"'%s:%d'. Malformed hidden service descriptor?",
escaped(reason), conn->base_.address, conn->base_.port);
log_fn(LOG_PROTOCOL_WARN, LD_REND,
"Uploading hidden service descriptor: http "
"status 400 (%s) response from dirserver "
"'%s:%d'. Malformed hidden service descriptor?",
escaped(reason), conn->base_.address, conn->base_.port);
/* XXX: Trigger control event. */
break;
default: