commit 3830599a63e09008f7b17c1b37db277bf38d526f Merge: fa2bd19 c4152a2 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 20 14:18:35 2017 -0400
Merge branch 'maint-0.3.1'
changes/bug16082 | 4 ++++ doc/tor.1.txt | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-)