[tor-commits] [tor/master] Silence a warning about failed descriptor uploads.

[nickm at torproject.org]

commit c4a56ed5c2663ab76460407d6f5a4da8b0f8c600
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Nov 14 17:16:33 2017 +0200

    Silence a warning about failed descriptor uploads.
    
    Due to #23662 this can happen under natural causes and does not disturb
    the functionality of the service. This is a simple 0.3.2 fix for now,
    and we plan to fix this properly in 0.3.3.
---
 changes/bug23662   | 4 ++++
 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 000000000..1000bde3d
--- /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 b2e0a96a2..836f86298 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: