[tor-commits] [tor/master] Merge branch 'bug19960_2' into maint-0.2.9

[nickm at torproject.org]

commit d838a812bd17f9bf68b77b5771c2388b82e17f15
Merge: f602172 53d4e89
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 8 07:48:14 2016 -0500

    Merge branch 'bug19960_2' into maint-0.2.9

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