commit d5de1a0a5514c51d39f8acdb0c906a186854e681 Merge: c320c52e8 bbe417ae8 Author: David Goulet dgoulet@torproject.org Date: Wed Feb 13 11:02:02 2019 -0500

Merge branch 'tor-github/pr/651'

changes/bug29161 | 3 +++ changes/ticket28668 | 3 +++ changes/ticket29160 | 4 ++++ src/lib/encoding/time_fmt.c | 4 ++++ src/test/test_address.c | 2 +- src/test/test_pt.c | 6 ++++++ src/test/test_util.c | 24 ++++++++++++++++++++++++ src/test/testing_common.c | 18 ++++++++++++++++++ 8 files changed, 63 insertions(+), 1 deletion(-)