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

[nickm at torproject.org]

commit 79f929723f12ce414a17789966972f97032db255
Merge: f81078527 fe3331b84
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 4 14:57:06 2019 -0500

    Merge branch 'maint-0.3.4' into release-0.3.4

 changes/bug28619    | 6 ++++++
 src/or/hs_service.c | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)