commit ffbc8a7c273582a417e1282bdd73763437e036b2 Merge: d7052dd48 6efc2a0e1 Author: David Goulet dgoulet@torproject.org Date: Wed Feb 13 11:00:06 2019 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

changes/bug29161 | 3 +++ changes/ticket28668 | 3 +++ changes/ticket29160 | 4 ++++ src/lib/encoding/time_fmt.c | 4 ++++ src/test/test_address.c | 3 +-- src/test/test_util.c | 24 ++++++++++++++++++++++++ src/test/testing_common.c | 18 ++++++++++++++++++ 7 files changed, 57 insertions(+), 2 deletions(-)