commit e9b1d0619f49193369538283900a92c13018535d Merge: 2a3b651 382a289 Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 7 11:46:00 2016 -0400

Merge remote-tracking branch 'dgoulet/ticket18693_029_01'

changes/feature18693 | 5 ++ doc/tor.1.txt | 17 ++++++- src/or/config.c | 50 ++++++++++++++++--- src/or/connection_edge.c | 61 +++++++++++++++++++++-- src/or/or.h | 2 + src/test/test_config.c | 125 ++++++++++++++++++++++++++++++++++++++++------- 6 files changed, 231 insertions(+), 29 deletions(-)