[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

[nickm at torproject.org]

commit 9556668f5fe33faec2a2de049d10061150ac6608
Merge: bc4c966 f3c20a2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 15 14:52:12 2014 -0400

    Merge remote-tracking branch 'origin/maint-0.2.4'

 changes/bug11519    |    3 +++
 src/or/circuituse.c |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)