commit a5bed4dab2f8521f744d5137e4f439b073c7e5e9 Merge: 6b2087d 601c823 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jan 28 11:53:03 2016 -0500 Merge branch 'maint-0.2.7' doc/tor.1.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)