commit 451a2fac0cd3c71476daebc42db76f322e08428f Merge: 20569f9 dbd4a01 Author: Roger Dingledine arma@torproject.org Date: Tue Mar 8 16:12:45 2011 -0500

Merge branch 'maint-0.2.2' into release-0.2.2

changes/bug1035 | 13 +++++++++ changes/bug2629 | 5 +++ changes/bug2660 | 7 +++++ doc/HACKING | 62 +++++++++++++++++++++++++++++++++++++-------- src/common/address.c | 18 ++++++------ src/or/circuitbuild.c | 3 +- src/or/connection_or.c | 3 -- src/or/dirserv.c | 18 +++++++++--- src/or/rephist.c | 65 ++++++++++++++++++++++++++++++++++++++++++------ src/or/rephist.h | 3 +- 10 files changed, 159 insertions(+), 38 deletions(-)