commit 8506dcdeb70279fd9c40e0d7b39d8a6dfed83085 Merge: 0d9dc13e0 0906dde9d Author: David Goulet dgoulet@torproject.org Date: Tue Dec 4 12:55:02 2018 -0500

Merge branch 'maint-0.3.5'

changes/ticket28275 | 4 ++++ doc/tor.1.txt | 4 ++++ 2 files changed, 8 insertions(+)