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

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.

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);
 }