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

[nickm at torproject.org]

commit a846fd267edf5a457d6647b37ad7ef2ac62a1612
Merge: d44080a09 da778f292
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 31 14:37:48 2018 -0500

    Merge branch 'bug23954_squashed'

 changes/bug23954               |  4 ++++
 src/or/config.c                | 49 +++++++++++++++++++++++++++++++++++-------
 src/or/config.h                |  1 +
 src/or/main.c                  |  1 +
 src/test/fuzz/fuzzing_common.c |  2 ++
 src/test/testing_common.c      |  1 +
 6 files changed, 50 insertions(+), 8 deletions(-)