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

[nickm at torproject.org]

commit e0f4e6a2eb0c36b47aa4540926bdf441ecc9873b
Merge: 73eebf4c8 e847909b7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 2 09:04:25 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 changes/ticket27410 | 5 +++++
 src/or/hs_client.c  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)