[tor-commits] [tor/maint-0.3.5] Merge remote-tracking branch 'dgoulet/ticket28619_033_01' into maint-0.3.3

[nickm at torproject.org]

commit bf8bb9c526a7dc99ab56b6e4786737f4617bb4ed
Merge: 1ea312718 d37dbb09c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 4 14:49:16 2019 -0500

    Merge remote-tracking branch 'dgoulet/ticket28619_033_01' into maint-0.3.3

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