commit b120d8b8365641ead5f0cfc659613ac95bee1123 Merge: cca803e2b 34e4d5a78 Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 15 16:37:41 2018 -0500

Merge branch 'maint-0.3.3' into release-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(-)