commit 4f62f420feb5e5d29ca9db4ea0e486b11023844f Merge: c1414cf 491dc3a Author: Roger Dingledine arma@torproject.org Date: Tue Jun 5 18:38:32 2012 -0400

Merge branch 'maint-0.2.2' into release-0.2.2

changes/bug5283 | 6 ++++++ changes/bug5969_022 | 7 +++++++ changes/bug6007 | 5 +++++ changes/bug6033 | 6 ++++++ src/common/compat.h | 5 +++-- src/common/log.c | 7 +++++++ src/common/tortls.c | 15 +++++++++++++++ src/common/util.h | 6 +++++- src/or/circuituse.c | 8 +++++++- src/or/connection_or.c | 22 ++++++++++++++++++++-- src/or/control.c | 16 +++++++++++++--- 11 files changed, 94 insertions(+), 9 deletions(-)