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

[nickm at torproject.org]

commit 08d5fd39d85d4f7174b52ef5d53db001398481ea
Merge: a7e72f0c4 a08e6e711
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 7 08:42:19 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

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