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

[nickm at torproject.org]

commit 633e99575ff5576ea01cc03c085b22776972bcc3
Merge: d1ec7bb06 6b2ef2c55
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 15 12:52:54 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

 src/or/hs_intropoint.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)