[tor-commits] [tor/master] Merge branch 'ticket28668_035' into ticket28668_040

commit d23704bf26ae6c00e97fb0c3ceb4a362c49eaf07 Merge: 3da3aca08 2d74da3d0 Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 23 14:50:22 2019 -0500

Merge branch 'ticket28668_035' into ticket28668_040

changes/bug29161 | 3 +++ changes/ticket29160 | 4 ++++ src/lib/encoding/time_fmt.c | 4 ++++ src/test/test_address.c | 2 +- src/test/test_util.c | 21 +++++++++++++++++++++ 5 files changed, 33 insertions(+), 1 deletion(-)