Roger Dingledine 6a76007b08 Merge branch 'maint-0.2.2' ...

Conflicts:
	src/or/dirserv.c

2011-11-21 18:36:49 -05:00

..

bug4518

Only call cull_wedged_cpuworkers once every 60 seconds.

2011-11-19 18:30:55 -05:00

feature4484

parameterize bw cutoffs to guarantee Fast and Guard flags

2011-11-21 18:22:10 -05:00