commit 9a790f7325049fdb3b48e86879cd05373cbcd1e3 Merge: 7918e21 caf7422 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Nov 14 10:37:29 2016 -0500 Merge branch 'maint-0.2.9' doc/tor.1.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)