commit 33b86071b765b6254f5aab13fc6dceebe206b103 Merge: 00f95c2 5cc155e Author: Roger Dingledine arma@torproject.org Date: Sat Nov 2 06:35:46 2013 -0400

Merge branch 'maint-0.2.4' into release-0.2.4

changes/bug6055 | 6 ++++++ changes/bug9645a | 5 +++++ changes/bug9731 | 3 +++ changes/bug9780 | 8 ++++++++ doc/tor.1.txt | 2 +- src/common/tortls.c | 7 ++++--- src/or/connection.c | 6 ++++++ src/or/microdesc.c | 9 ++++----- 8 files changed, 37 insertions(+), 9 deletions(-)