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

[nickm@xxxxxxxxxxxxxx]

commit 74e8fd22c9971a7184d74d2775ca1c575e54e08f
Merge: 35574d4a9 132e2f69b
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Oct 23 08:53:25 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

 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