commit a7d0cbd4626a75e9b90ae50a042e59a7034949af Merge: f74150564 1ec54b355 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 11 12:19:13 2018 -0400 Merge remote-tracking branch 'tor-github/pr/314' src/tools/tor-resolve.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)