[tor-commits] [obfsproxy/master] Merge remote-tracking branch 'sebastian/bug5149'