[tor-commits] [tor/master] Merge branch 'maint-0.3.4'

[nickm at torproject.org]

commit b7fbd1f3297d548b16a18bbc7a5636c80fff70de
Merge: 8b3ec74e5 38599de2d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 16 08:04:34 2018 -0400

    Merge branch 'maint-0.3.4'

 changes/ticket27810        | 5 +++++
 src/test/test_hs_service.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)