[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug27550_035_01'

[nickm at torproject.org]

commit 5e5e019b31296b5a829afc4f7f3766697888b678
Merge: c82163dff 36be6f0d2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 26 08:36:09 2018 -0400

    Merge remote-tracking branch 'dgoulet/bug27550_035_01'

 changes/ticket27550               |  5 +++++
 src/feature/dirclient/dirclient.c |  2 +-
 src/feature/hs/hs_client.c        |  4 ----
 src/feature/hs/hs_descriptor.c    | 20 +++++++++++++++++---
 4 files changed, 23 insertions(+), 8 deletions(-)