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

[nickm at torproject.org]

commit 340607639c23452e6b3b401c3fb4b08db6240413
Merge: 7aebf292d 08d5fd39d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 7 08:42:19 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug27465     | 5 +++++
 src/common/address.c | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)