commit e52f49aa800019d3f60b640f5bb82ef7cf5f78e5 Merge: 9023d73 0dd48bf Author: Nick Mathewson nickm@torproject.org Date: Sat Jan 21 14:44:00 2017 -0500

Merge remote-tracking branch 'public/ticket18319'

changes/ticket18319 | 4 ++++ doc/tor.1.txt | 2 +- src/or/config.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-)