Merge branch 'bug2321' into maint-0.2.2
commit1478aa99b7f113ccb800dc9a94e3501968aa59c6
authorNick Mathewson <nickm@torproject.org>
Wed, 26 Jan 2011 16:06:55 +0000 (26 11:06 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 26 Jan 2011 16:06:55 +0000 (26 11:06 -0500)
tree4073012a960847e1b1096bd2ad2c071947080036
parent9e7691b05c77261290b10ef433bf377f02a98705
parent9a4b2ec764de7ff49931a4ea561febada728d9b3
Merge branch 'bug2321' into maint-0.2.2
src/or/circuitbuild.c