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

[arma at torproject.org]

commit 6097b8eefc40a581e9ca4a25cc5f14a1f9ecb3c3
Merge: 031d8fc a74e7fd
Author: Roger Dingledine <arma at torproject.org>
Date:   Wed Oct 26 17:41:24 2011 -0400

    Merge branch 'maint-0.2.1' into release-0.2.1

 changes/issue-2011-10-19L |   21 ++++++++++
 changes/issue-2011-10-23G |    9 ++++
 src/common/tortls.c       |   93 ++++++++++++++++++++++++++-------------------
 src/or/command.c          |   13 +++++-
 src/or/connection_or.c    |    7 +++
 src/or/or.h               |    6 +++
 6 files changed, 108 insertions(+), 41 deletions(-)