commit 162d2022e1fa4d46480727bae9db650d50c4a21c Merge: 44ea7af 601b410 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Feb 10 15:50:28 2016 -0500 Merge branch 'bug17682_squashed' src/or/main.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)