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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.3' into maint-0.3.4

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