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

[nickm at torproject.org]

commit b65889359035280282904a9f164671552c8aa9b7
Merge: ab01371 53d4e89
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 7 15:23:14 2016 -0500

    Merge branch 'bug19960_2'

 changes/bug19960        |  4 ++++
 src/or/config.c         |  2 +-
 src/test/test_options.c | 13 +++++++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)