[tor-commits] [obfsproxy/master] Merge remote-tracking branch 'asn/bug_error_or_eof'