[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

[nickm at torproject.org]

commit 6b3c07648ce5860f5ef0f4193eb812e971c02407
Merge: b62b40a57 9ef97a268
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 3 10:09:20 2018 -0500

    Merge branch 'maint-0.3.2'

 changes/bug24634          |  3 +++
 src/or/hs_common.c        | 14 +++++++-------
 src/or/hs_service.c       | 14 +++++++-------
 src/test/test_hs_common.c |  6 +++---
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --cc src/or/hs_service.c
index 80f3e5020,45810c5c5..0db22991c
--- a/src/or/hs_service.c
+++ b/src/or/hs_service.c
@@@ -2265,13 -2284,10 +2265,13 @@@ upload_descriptor_to_hsdir(const hs_ser
               (is_next_desc) ? "next" : "current",
               desc->desc->plaintext_data.revision_counter,
               safe_str_client(node_describe(hsdir)),
-              safe_str_client(hex_str((const char *) index, 32)));
+              safe_str_client(hex_str((const char *) idx, 32)));
 +
 +    /* Fire a UPLOAD control port event. */
 +    hs_control_desc_event_upload(service->onion_address, hsdir->identity,
-                                  &desc->blinded_kp.pubkey, index);
++                                 &desc->blinded_kp.pubkey, idx);
    }
  
 -  /* XXX: Inform control port of the upload event (#20699). */
   end:
    tor_free(encoded_desc);
    return;