[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

[nickm at torproject.org]

commit 427dcb29b573d839551e8e3982af6e40d7d42609
Merge: b7db39e 8a767ba
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 17 20:08:15 2016 -0500

    Merge branch '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(-)