commit 1ed6cb0debea5743d95276066745db21e618ef26 Merge: e66c30e a271ad2 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Feb 7 09:27:49 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug21280 | 5 +++++ src/tools/tor-resolve.c | 4 ++++ 2 files changed, 9 insertions(+)