commit 8230cf7ea601266a70e1cf1b7610d592c177496b Merge: f7e8bd6 7ffa95a Author: Nick Mathewson <ni...@torproject.org> Date: Mon Dec 5 08:17:01 2016 -0500
Merge remote-tracking branch 'jryans/local-hostname' changes/17070 | 4 ++++ doc/tor.1.txt | 3 ++- src/common/address.c | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) _______________________________________________ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits