[tor-commits] [tor/master] Merge remote-tracking branch 'asn-mytor/bug5589_take2'

[nickm at torproject.org]

commit 4fdce6b091181f01295270eedb23ef7735904635
Merge: 7e57609 aa212b1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 14 13:05:16 2012 -0400

    Merge remote-tracking branch 'asn-mytor/bug5589_take2'

 changes/bug5589        |    3 +++
 src/or/circuitbuild.c  |   28 ----------------------------
 src/or/circuitbuild.h  |    2 --
 src/or/connection_or.c |    7 ++++---
 src/or/main.c          |    9 ---------
 5 files changed, 7 insertions(+), 42 deletions(-)