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

[nickm@xxxxxxxxxxxxxx]

commit 23e3d57e12bd0ca4bedae2307440e08e22744802
Merge: df57d1e0c c93ecb818
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Oct 23 09:06:34 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/ticket23910 | 3 +++
 src/or/config.c     | 3 +++
 2 files changed, 6 insertions(+)




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