commit 15e28af2d18b26b9ec4eda4bc2e84ed8465a166f Merge: c0ea6f9c6 f446db59e Author: George Kadianakis <desnacked@riseup.net> Date: Tue Jul 2 13:19:40 2019 +0300 Merge remote-tracking branch 'dgoulet/ticket31008_035_01' changes/ticket31008 | 3 +++ doc/tor.1.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)