[tor-commits] [tor/master] Merge branch 'maint-0.4.1'

[nickm@xxxxxxxxxxxxxx]

commit 0e1fd6d61fb6ee1a13cd142ff4c3a58f2012033d
Merge: b47adcbca 53d5b67f0
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Aug 8 15:25:00 2019 -0400

    Merge branch 'maint-0.4.1'

 changes/ticket31374        | 4 ++++
 src/lib/time/compat_time.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits