commit ab1b016d8a6ca5c3c7c2b79bd915eb2d02859d47 Merge: a3e63ea 17e8cb0 Author: Zack Weinberg <zackw at panix.com> Date: Tue Jul 19 09:57:38 2011 -0700 Merge branch 'master' of git://git.torproject.org/obfsproxy