[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug21510'

[nickm at torproject.org]

commit 1cd7a697f1ba96898580d4e6c6412bb245f853d1
Merge: aa50758 7a65abf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 28 11:43:58 2017 -0500

    Merge remote-tracking branch 'teor/bug21510'

 changes/bug21510            | 4 ++++
 src/test/log_test_helpers.h | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)