commit 33c54701b397e8983e913f5500b68b4dd5c5ef02 Merge: c290053 8a767ba Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 17 20:08:24 2016 -0500

Merge branch 'maint-0.2.9' into release-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(-)