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

[nickm at torproject.org]

commit 382beb93cb4110b2bcc82ab69c8e72c274a51ca2
Merge: 2eff709ed b343ba906
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 10 09:22:32 2018 -0400

    Merge branch 'maint-0.3.3'

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