Merge remote-tracking branch 'asn/bug23662_032' into maint-0.3.2

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.

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: