diff options
author | Roger Dingledine <arma@torproject.org> | 2011-11-21 18:36:49 -0500 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2011-11-21 18:36:49 -0500 |
commit | 6a76007b089a2ca31b67b2ce15dd28edeb416428 (patch) | |
tree | d61bc05bc50b9f4ac8782f321ae6af960c8fa9db /changes | |
parent | c9f24edb13faf17dc314be51127736acfc3de17a (diff) | |
parent | 97a209ea28f1b64fba51157e3e695c676eb0cf8e (diff) | |
download | tor-6a76007b089a2ca31b67b2ce15dd28edeb416428.tar.gz tor-6a76007b089a2ca31b67b2ce15dd28edeb416428.zip |
Merge branch 'maint-0.2.2'
Conflicts:
src/or/dirserv.c
Diffstat (limited to 'changes')
-rw-r--r-- | changes/bug4518 | 4 | ||||
-rw-r--r-- | changes/feature4484 | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/changes/bug4518 b/changes/bug4518 new file mode 100644 index 0000000000..8dcb93bf72 --- /dev/null +++ b/changes/bug4518 @@ -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. diff --git a/changes/feature4484 b/changes/feature4484 new file mode 100644 index 0000000000..78154e9649 --- /dev/null +++ b/changes/feature4484 @@ -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. + |