commit 55cae7dbf17352b0556a4099bebca8acb88b329d Merge: 60d0964 1cc06bd Author: Roger Dingledine arma@torproject.org Date: Fri Oct 19 14:30:58 2012 -0400

Merge branch 'maint-0.2.3' into release-0.2.3

changes/bug7139 | 9 +++++++++ changes/cve-2012-2249 | 5 +++++ changes/dirserv-BUGGY-a | 7 +++++++ src/common/tortls.c | 8 ++++++++ src/or/command.c | 1 + src/or/connection_or.c | 14 ++++++++++++-- src/or/connection_or.h | 1 + src/or/directory.c | 2 ++ 8 files changed, 45 insertions(+), 2 deletions(-)