commit 8e93cfb47f218dc7f431cfa820a5228b509d142c Merge: 3d8a045 7fa102b Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 29 10:18:09 2015 +0200

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

changes/bug17173-socket-hack-rv | 10 +++++ src/common/address.c | 27 +++++++---- src/common/address.h | 8 ++-- src/test/test_address.c | 95 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 127 insertions(+), 13 deletions(-)