[tor-commits] [obfsproxy/master] Merge branch 'master' of git://git.torproject.org/obfsproxy