commit 911e0a71a609864e1a10f6cc0ca5f16661f15ece Merge: d9c111d 7f6aa78 Author: Roger Dingledine <arma@torproject.org> Date: Mon Feb 10 16:41:13 2014 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug10485 | 4 + changes/bug10793 | 4 + changes/bug10835 | 4 + changes/bug9602 | 5 ++ changes/bug9716 | 4 + src/common/crypto.c | 20 ++--- src/common/tortls.c | 2 +- src/or/channeltls.c | 219 +++++++++++++++++++++++++++++++++--------------- src/or/connection.c | 39 ++++++++- src/or/connection_or.c | 5 ++ src/or/main.c | 5 -- src/or/rephist.c | 1 - src/or/status.c | 4 + src/test/bench.c | 4 + 14 files changed, 233 insertions(+), 87 deletions(-)