[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.3.2' of https://git.torproject.org/tor into maint-0.3.2

[nickm at torproject.org]

commit d1a6043bfb0a3869439565d563a93aeb0fa30923
Merge: 9c83cd199 0971b3ce4
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Sep 20 10:59:23 2018 -0400

    Merge branch 'maint-0.3.2' of https://git.torproject.org/tor into maint-0.3.2

 changes/bug27335    |  4 ++++
 changes/bug27658    |  6 ++++++
 src/ext/tinytest.c  | 12 ++++++++++--
 src/or/hs_service.c |  6 +++---
 4 files changed, 23 insertions(+), 5 deletions(-)