Reinstate some fixes/tweaks from 6e4a4002
commitb64dc35b5c27feb4a2df41934d644bc4957921bb
authorNick Mathewson <nickm@torproject.org>
Mon, 4 Feb 2013 16:51:39 +0000 (4 11:51 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 4 Feb 2013 16:51:39 +0000 (4 11:51 -0500)
treeadb253ed700d47092f7e63c0c37ba82e1c9191ee
parentddf2c36ab1e606ea9dcd0253512da16ab17b3457
Reinstate some fixes/tweaks from 6e4a4002

These seem to have gotten conflicted out of existence while mike was
working on path bias stuff.

Thanks to sysrqb for collecting these in a handy patch.
src/or/circuitbuild.c