commit 85674f59b385bbea97ce53e7bcc35e3d7134c05a Merge: c811ae3bd 0906dde9d Author: David Goulet <dgoulet@torproject.org> Date: Tue Dec 4 12:55:01 2018 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket28275 | 4 ++++ doc/tor.1.txt | 4 ++++ 2 files changed, 8 insertions(+)