commit 6b2087dbe42e2e4a81b5cac9278f81a97f80a1cb Merge: 4770db8 fb64c55 Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 28 10:22:06 2016 -0500

Merge branch 'maint-0.2.7'

changes/bug17583 | 4 ++++ doc/tor.1.txt | 29 +++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-)