commit 9b87a6c156fb4834649772ef9eb6be0a41d096de Merge: f15e7d4 9a9ab45 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 23 09:02:55 2015 -0400

Merge remote-tracking branch 'yawning/bug15759'

changes/bug15759 | 6 ++++++ src/test/test_address.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-)