[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

[arma at torproject.org]

commit a60d21a85deacad98fa04d20fb4e83b57ad191d7
Merge: a8e76de 3cebc5e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 4 16:08:02 2013 -0400

    Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
    
    Conflicts:
    	src/or/circuitbuild.c

 changes/bug9671_023 |    5 +++++
 src/or/circuituse.c |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)