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

[nickm at torproject.org]

commit a08e6e711fbcd6a12818f1fe14739fc0e870434d
Merge: 57b207efa 1570f17f9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 7 08:42:19 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.2

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