commit 34e4d5a78362b3f133958740a18d0ee06ae4fdad Merge: db3acb3aa 18085abfc Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 15 16:37:02 2018 -0500

Merge remote-tracking branch 'dgoulet/bug27550_033_01' into maint-0.3.3

changes/ticket27550 | 5 +++++ src/or/directory.c | 2 +- src/or/hs_client.c | 4 ---- src/or/hs_descriptor.c | 9 ++++++--- 4 files changed, 12 insertions(+), 8 deletions(-)