[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug9841_024_v2' into bug9841_025

[nickm at torproject.org]

commit 1bb6e3b503bfe4f7f5a8ee707433b6f9973e4dea
Merge: fb59592 09dbcf3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Apr 4 12:05:51 2014 -0400

    Merge remote-tracking branch 'public/bug9841_024_v2' into bug9841_025

 src/or/circuitlist.c |    5 +++++
 1 file changed, 5 insertions(+)