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

[nickm at torproject.org]

commit b83991fce37aa35dc0b2790d7fa41de42806e793
Merge: 5a2232e62 0e13ff481
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 16 13:48:23 2018 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

 src/common/address.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)