commit 5ec65be8bff9862d31f612bdd28c0b0d78b1f5cf Merge: ccab4347e d32e40797 Author: Roger Dingledine <arma@torproject.org> Date: Wed Feb 20 10:39:28 2019 -0500 Merge remote-tracking branch 'nickm/ticket29530_040' into maint-0.4.0 src/test/test_address.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)