commit 2bc4c55d7d17ba9d4dcfacd3f2b118e7144a146d Merge: 82d758afa f282375fb Author: Nick Mathewson <nickm@torproject.org> Date: Tue Aug 28 15:44:06 2018 -0400 Merge remote-tracking branch 'tor-github/pr/245' changes/bug20874 | 7 +++++++ src/app/config/config.c | 25 ------------------------- src/core/or/policies.c | 8 ++++++++ src/test/test_options.c | 12 ++++++++++++ 4 files changed, 27 insertions(+), 25 deletions(-)