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

[nickm@xxxxxxxxxxxxxx]

commit 9049b545c21bfda637faf28accbd74e3fc025cb6
Merge: 37698d92b 35257a1c6
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Feb 26 07:27:50 2019 -0500

    Merge branch 'maint-0.4.0' into release-0.4.0

 changes/bug13221        | 5 +++++
 src/app/config/config.c | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

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