[tor-commits] [tor/master] Merge remote-tracking branch 'yawning-schwanenlied/bug20261'

[nickm at torproject.org]

commit d25fed51746e848fc04cabefe58133e3957209de
Merge: 5a9696f 7b2c856
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 11 11:08:20 2016 -0400

    Merge remote-tracking branch 'yawning-schwanenlied/bug20261'

 changes/bug20261     |  4 ++++
 doc/tor.1.txt        |  5 +++--
 src/common/address.c | 16 ++++++++++++++++
 src/or/config.c      |  7 +++++++
 4 files changed, 30 insertions(+), 2 deletions(-)