commit e24c9022722119f4d0d631c7e4d02e347b9dc83d Merge: 230a3d1 31332a8 Author: Nick Mathewson nickm@torproject.org Date: Wed May 4 14:47:13 2016 -0400

Merge branch 'maint-0.2.8'

changes/bug18710 | 6 ++++++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-)