Commit a62c8433407c5c6d762394a3395470e34fb20f49

Nick Mathewson 2010-05-06T14:16:50

Merge commit 'chrisd/connect-hostname-report-err'