commit 2b9a907bdccc588203d2110866d4e7bb72a25773 Merge: 3741f9e52 056ffdec4 Author: David Goulet dgoulet@torproject.org Date: Mon Nov 26 14:59:24 2018 -0500

Merge branch 'maint-0.3.5'

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