[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

[arma at torproject.org]

commit c22446e3055603cdbbea36e31ea49436d9ca3e11
Merge: 4d4eda89a 5ec65be8b
Author: Roger Dingledine <arma at torproject.org>
Date:   Wed Feb 20 10:40:20 2019 -0500

    Merge branch 'maint-0.4.0'

 src/test/test_address.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)