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

[nickm at torproject.org]

commit d95d9889463fcab0eac742b1634d64f1e8b4328a
Merge: c4cc11a 83307fc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 23 16:07:15 2017 -0500

    Merge branch 'feature_20956_029'

 changes/feature20956 |  6 ++++++
 doc/tor.1.txt        | 13 +++++++++++++
 src/or/config.c      | 29 +++++++++++++++++++----------
 src/or/confparse.c   |  5 +++++
 4 files changed, 43 insertions(+), 10 deletions(-)