Merge remote branch 'mikeperry/consensus-bw-weights5-merge'

Conflicts:
	ChangeLog

diff --cc ChangeLog
index f09671f17175366a7fe1ccc2c57c02fdd9c90803,bc8baf48b8c97e30caa01d09f1d808b86a1f8393..c8369fc38283eb573e6ae27edd21cc66ce1c7431
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,17 -1,18 +1,32 @@@
 -Changes in version 0.2.2.10-alpha - ??
 +Changes in version 0.2.2.10-alpha - 2010-??-??
+   o Major features (performance):
+     - Alter the client path selection to use new consensus-generated
+       weightings to alter bandwidths when selecting Guard, Middle, Exit,
+       and Guard+Exit flagged nodes for entry, middle, and exit positions.
+       This should more evenly distribute the network load across these
+       different types of nodes, and give us the flexibility to globally
+       alter our node selection algorithms in the future.
+ 
+   o Minor features (performance):
+     - Always perform router selections using weighted node bandwidth,
+       even if we don't need a high capacity circuit at the time. Non-fast
+       circuits now only differ from fast ones in that they can use nodes
+       not marked with the Fast flag.
+ 
 +  o Minor bugfixes:
 +    - Fix a memleak in the EXTENDCIRCUIT logic. Spotted by coverity.
 +      Bugfix on 0.2.2.9-alpha.
 +    - Fix a dereference-then-NULL-check sequence when publishing
 +      descriptors. Bugfix on tor-0.2.1.5-alpha. Discovered by ekir,
 +      fixes bug 1255.
 +    - Disallow values larger than INT32_MAX for PerConnBWRate|Burst
 +      config option. Bugfix on 0.2.2.7-alpha.
 +
 +  o Code simplifications and refactoring:
 +    - Fix some urls in the exit notice file and make it XHTML1.1 strict
 +      compliant. Based on a patch from Christian Kujau.
 +
++
  Changes in version 0.2.2.9-alpha - 2010-02-22
    o Directory authority changes:
      - Change IP address for dannenberg (v3 directory authority), and