[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

[nickm at torproject.org]

commit 85db0c46eb522c1ae2974306694cb35002ba62a2
Merge: 572077b7f 31508a0ab
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 12 11:14:42 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug24782       |  4 +++
 src/common/compat.c    |  4 +--
 src/common/compat.h    |  2 +-
 src/or/config.c        | 35 +++++++++++++--------
 src/or/config.h        | 11 +++++++
 src/test/test_config.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 123 insertions(+), 16 deletions(-)