commit c6858cb5fe3c956b9413a29717071bdd1a28b3dd Merge: 57699de af88e8f Author: Nick Mathewson <nickm@torproject.org> Date: Sun Feb 28 15:22:56 2016 +0100 Merge remote-tracking branch 'teor/bug17193' doc/tor.1.txt | 5 +++++ 1 file changed, 5 insertions(+)