commit 1049d315d7055cb98095001cb5fefae0f40d36de Merge: 08e65ce 1004489 Author: Roger Dingledine <arma@torproject.org> Date: Tue Jul 31 05:10:23 2012 -0400 Merge branch 'maint-0.2.3' src/or/dns.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)