[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm@xxxxxxxxxxxxxx]

commit eaa359650cd4654744f8750ee6a59d8653e96147
Merge: f2e7570c7 53513e4bf
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Jun 12 09:44:17 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

 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