commit 2c5841a8b855b6340952a10b6014ec6cdd44ca87 Merge: a1a32b483 0c7740b7d Author: Nick Mathewson <nickm@torproject.org> Date: Mon May 7 13:31:03 2018 -0400 Merge remote-tracking branch 'saper/default_nickname' doc/tor.1.txt | 2 ++ src/config/torrc.minimal.in-staging | 2 +- src/config/torrc.sample.in | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)