commit 056ffdec4cd10aac964ca354115ef806869afe81 Merge: a9820f072 f41bec129 Author: David Goulet dgoulet@torproject.org Date: Mon Nov 26 14:59:10 2018 -0500

Merge remote-tracking branch 'dgoulet/ticket28128_035_01' into maint-0.3.5

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