commit 79c7625e38893920a80451ba420ee45ccd67f79b Merge: 69deab8 1ebed7c Author: Nick Mathewson <nickm@torproject.org> Date: Mon Feb 2 13:32:53 2015 -0500 Merge branch 'feature13864_squashed' changes/feature13865 | 5 +++++ doc/tor.1.txt | 3 ++- src/or/config.c | 25 ++++++++++++++++++++++++- 3 files changed, 31 insertions(+), 2 deletions(-)