[tor-commits] [tor/release-0.2.1] Merge branch 'maint-0.2.1' into release-0.2.1

[arma at torproject.org]

commit 9ac4ceb0d493bb7f743ed621189f5877f128f747
Merge: 7c29b69 cecc5b7
Author: Roger Dingledine <arma at torproject.org>
Date:   Wed Oct 26 16:34:20 2011 -0400

    Merge branch 'maint-0.2.1' into release-0.2.1

 changes/bug2235        |    3 +
 changes/bug2433        |    5 ++
 changes/bug2572        |    5 ++
 changes/bug3228        |    3 +
 src/common/crypto.c    |    4 +-
 src/common/tortls.c    |  138 +++++++++++++++++++++++++++++++++++-------
 src/common/tortls.h    |    5 +-
 src/or/config.c        |   24 +++++---
 src/or/connection_or.c |    5 +-
 src/or/dirserv.c       |    7 +-
 src/or/hibernate.c     |   21 ++++---
 src/or/main.c          |   15 +++--
 src/or/or.h            |   10 ++-
 src/or/router.c        |  158 ++++++++++++++++++++++++++++++++++++-----------
 14 files changed, 312 insertions(+), 91 deletions(-)