commit 5a1779b7ffa7445005dc271985bae43c6c761dc0 Merge: 8a38d05 d288704 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 26 14:17:21 2016 -0400

Merge branch 'maint-0.2.9'

changes/bug19869 | 4 ++++ src/or/dnsserv.c | 4 ++++ 2 files changed, 8 insertions(+)