[tor-commits] [tor/master] Merge remote-tracking branch 'gtank/feature16774-squashed'

[nickm at torproject.org]

commit 5ba7b1a74d3cfc85db898dd1af748bf4234fc9a7
Merge: 37b0d27 3bc45f2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 7 09:20:03 2016 -0800

    Merge remote-tracking branch 'gtank/feature16774-squashed'

 changes/feature16774   |    3 +++
 src/or/config.c        |   45 +++++++++++++++++++++++++++++++++++++--------
 src/test/test_config.c |    4 +++-
 3 files changed, 43 insertions(+), 9 deletions(-)