commit 74cbbda86e01a40e5cbf7889d5a5bc3445f68510 Merge: 3f33a5b 51b5d09 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jul 5 12:39:40 2016 -0400 Merge remote-tracking branch 'weasel/bug19556' into maint-0.2.8 changes/bug19556 | 7 +++++++ src/or/main.c | 1 + 2 files changed, 8 insertions(+)