commit 0ce4d23af5cd6ca3a5fe7f8b931b07f171b7f4ed Merge: d1af4d65d 9ce1978b5 Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 22 08:04:55 2019 -0500

Merge branch 'maint-0.3.5'

changes/bug28979 | 4 ++++ doc/tor.1.txt | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)