commit 1218d731d1f3c1944a22bba45ef2f6a0853eba5c Merge: e1e62f9 307b863 Author: Andrea Shepard andrea@torproject.org Date: Tue Mar 29 14:33:45 2016 +0000

Merge branch 'bug16248_027' into maint-0.2.7

changes/bug16248 | 8 ++++++++ src/or/main.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 59 insertions(+), 4 deletions(-)