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

[nickm at torproject.org]

commit cd14405a431cf351abe79441214899cfee5eb670
Merge: aeb9373 c464a36
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 7 15:21:23 2015 -0400

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

 changes/ifaddrs-tests-network-configs |    7 +++++
 src/test/test_address.c               |   46 +++++++++++++++++++++------------
 2 files changed, 37 insertions(+), 16 deletions(-)