Merge remote-tracking branch 'origin/maint-0.2.3'
commit920c76a2fcc843bc58b79195414d3ed4b693e76e
authorNick Mathewson <nickm@torproject.org>
Tue, 18 Sep 2012 20:20:01 +0000 (18 16:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 18 Sep 2012 20:20:01 +0000 (18 16:20 -0400)
tree95392e59c5ea244615d1643dd77e57aaaed453e7
parentf675e0a33efa5f32377e784b2612c2b6a5c9180b
parentaca325eb0c6b34ba0e1ef8df16c1cf44a98f9b6f
Merge remote-tracking branch 'origin/maint-0.2.3'
src/or/circuitbuild.c