commit 8a767ba7fbeedb3d8838ccfe57583203b783241d Merge: caf7422 44f3563 Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 17 20:02:59 2016 -0500
Merge remote-tracking branch 'teor/bug20634_029' into maint-0.2.9
changes/bug20634 | 3 +++ src/test/log_test_helpers.h | 17 ++++++++++++++++- src/test/test_address.c | 18 ++++++++++++++---- 3 files changed, 33 insertions(+), 5 deletions(-)