commit d621078bfcac176a49afc5399e43e4e743761859 Merge: 9a767f00b 1570f17f9 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 7 08:42:19 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

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