commit 0f718a85eaad6cd2b4ad34aff2b7f4face4eb258 Merge: 716d485 3b8888c Author: Nick Mathewson nickm@torproject.org Date: Mon May 15 18:24:24 2017 -0400

Merge branch 'bug22246_030' into maint-0.3.0

changes/bug22246 | 6 ++++++ src/or/main.c | 1 + 2 files changed, 7 insertions(+)