commit d8263ac254933bb8a4809aae9ff034923e2dccae Merge: 548b4be a0f892f Author: Nick Mathewson <nickm@torproject.org> Date: Wed Mar 18 08:58:15 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' changes/ticket15176 | 3 ++ src/or/main.c | 105 ++++++++++++++++++++++++++++++++------------------- 2 files changed, 69 insertions(+), 39 deletions(-)