commit 222f2fe469c87d575995af9fb585a5fc30c6a5d0 Merge: 78011bb 51b562c Author: Nick Mathewson nickm@torproject.org Date: Wed Feb 1 09:30:02 2017 -0500

Merge branch 'bug21150_030_01_squashed'

changes/bug21150 | 5 +++++ src/or/config.c | 5 +++-- src/or/or.h | 4 ++++ 3 files changed, 12 insertions(+), 2 deletions(-)