commit a6b3a3ee1edb57614f50da9979736dd074fb4450 Author: George Kadianakis desnacked@riseup.net Date: Tue Jul 22 13:57:24 2014 +0300

Do the release ritual for obfsproxy-0.2.12. --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog index c97ea11..b9791da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Changes in version 0.2.12 - 2014-07-22: + - Add txsocksx and parsley as dependencies in py2exe. Fixes bug #12381. + + Changes in version 0.2.11 - 2014-07-16: - Write a 'server_password' file with the scramblesuit password to make it easier for bridge operators to find their password. Patch