[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm@xxxxxxxxxxxxxx]

commit 132e2f69b1068b139d3c114fddd6efe58d6fc8f4
Merge: fcaf3335b 6f87a8589
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Oct 23 08:53:25 2017 -0400

    Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bug23690     | 5 +++++
 src/or/circuitlist.c | 1 +
 2 files changed, 6 insertions(+)




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