commit 8d25ab6347910784ee100b6b4a784c7a6779277b Merge: 74cbbda 55d380f Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 5 12:40:25 2016 -0400

Merge remote-tracking branch 'weasel/bug19557' into maint-0.2.8

changes/bug19557 | 4 ++++ src/or/main.c | 1 + 2 files changed, 5 insertions(+)