Merge branch 'maint-0.2.2'

Conflicts:
	src/or/dirserv.c
This commit is contained in:
Roger Dingledine
2011-11-21 18:36:49 -05:00
7 changed files with 62 additions and 14 deletions
+4
View File
@@ -0,0 +1,4 @@
o Minor bugfixes (performance):
- Avoid frequent calls to the fairly expensive cull_wedged_cpuworkers
function. This was eating up hideously large amounts of time on some
busy servers. Fixes bug 4518.
+8
View File
@@ -0,0 +1,8 @@
o Minor features:
- Add two new config options for directory authorities:
AuthDirFastGuarantee sets a bandwidth threshold for guaranteeing the
Fast flag, and AuthDirGuardBWGuarantee sets a bandwidth threshold
that is always sufficient to satisfy the bandwidth requirement for
the Guard flag. Now it will be easier for researchers to simulate
Tor networks with different values. Resolves ticket 4484.