commit be26c8875727fce074ea63b01a5032dd089136de Merge: a8a26ca 551af4f Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 19 11:20:26 2015 -0400

Merge commit '551af4f97d37c7b4cff7a8557c1a1a647487b4cb'

changes/bug17173-socket-hack-rv | 9 +-------- changes/bug17237_027 | 3 +-- changes/ifaddrs-tests-network-configs | 12 +++++------- 3 files changed, 7 insertions(+), 17 deletions(-)