commit 4b599aaae4fc33460553306a8bba41d777558420 Merge: 4587e67df cdafcc49b Author: David Goulet <dgoulet@torproject.org> Date: Wed Apr 24 09:43:28 2019 -0400 Merge branch 'tor-github/pr/939' changes/bug30151 | 5 +++++ src/tools/tor-resolve.c | 1 + 2 files changed, 6 insertions(+)