[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug11278'

[nickm@xxxxxxxxxxxxxx]

commit 17d5734df47bc4b9bd40f878e492eb676ca47ae8
Merge: 86f619d 852fd18
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Apr 1 21:56:49 2014 -0400

    Merge remote-tracking branch 'public/bug11278'

 changes/bug11278     |    3 +++
 src/or/circuitlist.c |   12 ++++++++++++
 2 files changed, 15 insertions(+)

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