[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'

[nickm at torproject.org]

commit 003462432b1ddcd938031fb7f2f7a403125b0ccb
Merge: 62d6a8e d4212d5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 29 13:51:08 2015 +0200

    Merge remote-tracking branch 'origin/maint-0.2.7'

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