[tor-commits] [tor/master] Merge branch 'tor-github/pr/1299'

[asn at torproject.org]

commit 3aaa4d416beee81eba3fed1ce9eda17e686fed52
Merge: 87944cecf c3b1a25d4
Author: George Kadianakis <desnacked at riseup.net>
Date:   Thu Sep 12 18:08:00 2019 +0300

    Merge branch 'tor-github/pr/1299'

 src/test/test_addr.c | 66 ++++++++++++++++++++--------------------------------
 1 file changed, 25 insertions(+), 41 deletions(-)