commit 4619fd4a20b5cb140189cb067a0a22497065230f Merge: 7eb84e1 eb68ea2 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Mar 12 13:24:37 2015 -0400 Merge branch 'maint-0.2.6' into release-0.2.6 changes/bug15240 | 6 ++++++ changes/ticket15212 | 6 ++++++ src/or/channeltls.c | 3 +++ src/or/config.c | 13 +++++++------ src/or/connection_or.c | 1 + src/or/rephist.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/or/rephist.h | 4 ++++ src/or/status.c | 4 +++- src/test/test_status.c | 8 +++++++- 9 files changed, 81 insertions(+), 8 deletions(-)