[tor-commits] [tor/main] Merge branch 'maint-0.4.6'

[asn at torproject.org]

commit 6aff048978aa474d1359a612b8a7010df23097bc
Merge: e71db3a4be 167f3bc4ec
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Jul 6 13:42:53 2021 +0300

    Merge branch 'maint-0.4.6'

 changes/bug40383            |  7 +++++++
 configure.ac                |  1 +
 src/lib/encoding/time_fmt.c | 35 +++++++++++++++++++++++++++++++++--
 src/lib/encoding/time_fmt.h |  6 ++++++
 src/test/test_util.c        | 26 +++++++++++++++++++++++++-
 5 files changed, 72 insertions(+), 3 deletions(-)