commit c49975a2b895b9742caba29e7cbd4067252c36c0 Merge: d4e2ccc 122c8ef Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 31 17:20:36 2012 -0400

Merge remote-tracking branch 'origin/maint-0.2.3'

changes/bug6480 | 5 +++++ src/or/dns.c | 30 ++++++++++++++++++------------ 2 files changed, 23 insertions(+), 12 deletions(-)