commit eb68ea20f833b4ced42fdfa008c6ec3d0a07c847 Merge: b3281fc d29a8ad Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 12 13:15:08 2015 -0400

Merge remote-tracking branch 'public/feature15212_026' into 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(-)