diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-15 14:25:20 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-15 14:25:20 -0500 |
| commit | ae8683621add4b7fe68ba82f76b231ef8551477f (patch) | |
| tree | 0e9ef82d073cfde028fce63cf587cfbcba1d39b8 | |
| parent | 6dc784bdb3d49e10b161050212672a8f34b51865 (diff) | |
| parent | c4a56ed5c2663ab76460407d6f5a4da8b0f8c600 (diff) | |
| download | tor-ae8683621add4b7fe68ba82f76b231ef8551477f.tar.gz tor-ae8683621add4b7fe68ba82f76b231ef8551477f.zip | |
Merge remote-tracking branch 'asn/bug23662_032' into maint-0.3.2
| -rw-r--r-- | changes/bug23662 | 4 | ||||
| -rw-r--r-- | src/or/directory.c | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/changes/bug23662 b/changes/bug23662 new file mode 100644 index 0000000000..1000bde3d6 --- /dev/null +++ b/changes/bug23662 @@ -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. diff --git a/src/or/directory.c b/src/or/directory.c index b2e0a96a2f..836f862988 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3339,10 +3339,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: |