commit 8e7ee0e2c0cff0fc28479ebe6eca60cfb0f4f980 Merge: 351f245 6215ebb Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 11 09:08:50 2014 -0400

Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5

changes/bug12160 | 4 +++ changes/bug12908 | 4 +++ changes/bug13096 | 4 +++ changes/bug13124 | 8 ++++++ src/or/channel.c | 17 +++++++++++++ src/or/channel.h | 1 + src/or/channeltls.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++-- src/or/channeltls.h | 1 + src/or/config.c | 11 +++++++-- src/or/connection_or.c | 9 +++++++ src/or/routerlist.c | 2 +- 11 files changed, 120 insertions(+), 5 deletions(-)