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

[nickm@xxxxxxxxxxxxxx]

commit 2ecd36f3c31378a8283d25a97ab81f01f2c52b2f
Merge: 552688c5c 90f4ed233
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Aug 19 10:37:21 2019 -0400

    Merge branch 'maint-0.4.0' into release-0.4.0

 changes/ticket31406          | 3 +++
 src/app/config/auth_dirs.inc | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

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