Nick Mathewson 86258df65d Merge branch 'split_circuitbuild' ...

Conflicts:
	src/or/circuitbuild.c

There was a huge-looking conflict in circuitbuild.c, but the only
change that had been made to circuitbuild.c since I forked off the
split_circuitbuild branch was 17442560c4.  So I took the
split_circuitbuild version of the conflicting part, and manually
re-applied the change from 17442560c44e8093f9a..

2012-10-22 11:35:32 -04:00

..

split_circuitbuild

Move the circuit build timeout code into its own file.

2012-10-15 14:50:55 -04:00