[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4

[nickm at torproject.org]

commit 1e6ffeaeaaf3c01a85c69e9cee76f124720bb8c8
Merge: 27b917047 34e4d5a78
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 15 16:37:41 2018 -0500

    Merge branch 'maint-0.3.3' into maint-0.3.4

 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(-)