[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'

[nickm at torproject.org]

commit 6864a44a4a6372c909ed8ea308881e4e8420046e
Merge: ca09ea0 ce4add4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 24 12:51:50 2012 -0400

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

 changes/bug6472 |    4 ++++
 src/or/dns.c    |   16 ++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)