commit 0fc5fdc430968a62a0310fc7022c4562b4625bf2 Merge: c3fca4e4b 2529b29a7 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Feb 19 11:55:53 2019 -0500 Merge remote-tracking branch 'tor-github/pr/659' changes/ticket29070 | 2 ++ contrib/client-tools/torify | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)