5 Commits

Author	SHA1	Message	Date
Nick Mathewson	5b0b51ca3f	Merge remote-tracking branch 'public/bug6304_v3' into maint-0.2.4 ... Conflicts: src/or/circuitbuild.c src/or/config.c	2013-03-20 10:31:56 -04:00
Mike Perry	da5817772d	Rename and relocate the bw weight scale param getter. ... It had nothing to do with circuit build times.	2013-02-01 17:01:22 -05:00
Nick Mathewson	4da083db3b	Update the copyright date to 201.	2013-01-16 01:54:56 -05:00
Mike Perry	42e3c04a7a	Bug 3443: Don't count ORconn setup in circuit build time. ... Also, add a hack Roger suggested where we're more patient if no circuits are opened yet.	2012-12-07 10:34:09 -05:00
Nick Mathewson	907db008ab	Move the circuit build timeout code into its own file.	2012-10-15 14:50:55 -04:00