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

[nickm@xxxxxxxxxxxxxx]

commit 707076002d4db2b8b2e6f05bea86316674bf9f45
Merge: 94c59851d fb5877b97
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Jan 2 10:10:28 2018 -0500

    Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug24736  | 6 ++++++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)




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