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

[nickm@xxxxxxxxxxxxxx]

commit 16381b579ecd2a050d117765d51ead4b3c3ebbb9
Merge: d84581a3e ef671147f
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Jun 12 09:44:17 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)



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