tor

commit 6dc784bdb3d49e10b161050212672a8f34b51865
parent 6059784be0b022adbe274035acc920381ca3fef0
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 14 Nov 2017 14:45:07 -0500

Merge remote-tracking branch 'dgoulet/bug24230_032_01' into maint-0.3.2

Diffstat:
A
changes/bug24230
 | 
4
++++
M
src/or/control.c
 | 
2
+-

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/changes/bug24230 b/changes/bug24230
@@ -0,0 +1,4 @@
+  o Minor bugfixes (control port, hidden service):
+    - Control port was reporting the action "UPLOAD_FAILED" instead of
+      "FAILED" for the HS_DESC event when a service was not able to upload a
+      descriptor. Fixes bug 24230; bugfix on 0.2.7.1-alpha.
diff --git a/src/or/control.c b/src/or/control.c
@@ -7284,7 +7284,7 @@ control_event_hs_descriptor_upload_failed(const char *id_digest,
              id_digest);
     return;
   }
-  control_event_hs_descriptor_upload_end("UPLOAD_FAILED", onion_address,
+  control_event_hs_descriptor_upload_end("FAILED", onion_address,
                                          id_digest, reason);
 }