[tor-commits] [tor/master] Merge branch 'bug21294_030_01_squashed'

commit b11f00c153dc6e107642258e1efe5a6daf641925 Merge: fc3e742 83df359 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Feb 2 08:48:20 2017 -0500 Merge branch 'bug21294_030_01_squashed' changes/bug21294 | 6 ++++++ src/or/config.c | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-)