[tor-commits] [tor/master] Merge branch 'bug6480_squashed' into maint-0.2.3

[nickm at torproject.org]

commit 122c8efb09643a65cbec6c991f3433774a4524ae
Merge: ae75fb1 62637fa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 31 17:19:47 2012 -0400

    Merge branch 'bug6480_squashed' into maint-0.2.3

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