[tor-commits] [tor/release-0.2.3] Merge remote-tracking branch 'public/bug6472' into maint-0.2.3

[arma at torproject.org]

commit ce4add498f6af197a0e856d262825d547f898305
Merge: 991a8ac 223e7cf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 24 12:51:02 2012 -0400

    Merge remote-tracking branch 'public/bug6472' into maint-0.2.3

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