[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0

[teor at torproject.org]

commit 3d04e0bf707ef55ced65966b61907962f8d9f8e4
Merge: 88276ee02 bad001080
Author: teor <teor at torproject.org>
Date:   Sat Aug 10 07:26:26 2019 +1000

    Merge branch 'maint-0.4.0' into release-0.4.0

 changes/bug30561                   |  6 ++++++
 changes/bug30781                   |  4 ++++
 changes/bug31343                   |  9 +++++++++
 changes/ticket31374                |  4 ++++
 src/core/or/channeltls.c           | 20 ++++++++++++++++----
 src/feature/dirparse/routerparse.c |  3 +++
 src/feature/nodelist/routerlist.c  |  6 ++++--
 src/lib/string/printf.c            | 16 +++++++++++++---
 src/lib/time/compat_time.c         |  2 +-
 9 files changed, 60 insertions(+), 10 deletions(-)