commit c775689e96be101d2818722aa92393190ca3fc6d Merge: 61d5bcc1a dddc9a171 Author: Nick Mathewson <nickm@torproject.org> Date: Sat Aug 11 10:05:15 2018 -0400 Merge remote-tracking branch 'tor-github/pr/244' changes/bug26882 | 5 +++++ doc/tor.1.txt | 4 +++- src/core/or/channeltls.c | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-)