[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug5916'

[nickm at torproject.org]

commit 9e53cdca86483942fe0e836fb1fa6942a9e883a7
Merge: 5e805ff 4c4dd50
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 30 11:14:41 2012 -0400

    Merge remote-tracking branch 'public/bug5916'

 changes/bug5916 |    6 ++++++
 src/or/dns.c    |    4 +++-
 2 files changed, 9 insertions(+), 1 deletions(-)