[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'

commit 3ee2fca7ca6138916688d7d415a1091b8b3e1724 Merge: 16b1b21 eb68ea2 Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 12 13:16:22 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.6'

changes/ticket15212 | 6 ++++++ src/or/channeltls.c | 3 +++ 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 +++++++- 7 files changed, 68 insertions(+), 2 deletions(-)