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

[nickm at torproject.org]

commit 4a740451acdd953440312e355baa6837825fa405
Merge: 5cea500 e9c1c3f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 6 20:44:41 2014 -0400

    Merge remote-tracking branch 'public/bug11750'

 changes/bug11750     |    5 +++++
 src/or/circuitlist.c |   10 +++++++++-
 src/test/bench.c     |   25 +++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)