commit 17d368281ad374908fb019e29f3f012659be010c Merge: 1129362 fab8fd2 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Oct 16 11:20:43 2013 -0400 Merge remote-tracking branch 'linus/bug9206_option' changes/bug9206 | 6 ++++++ doc/tor.1.txt | 9 +++++++++ src/or/config.c | 1 + src/or/dirserv.c | 6 ++++++ src/or/or.h | 4 ++++ 5 files changed, 26 insertions(+)