[Pkg-privacy-commits] [obfsproxy] 265/353: Massage the ChangeLog a bit.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository obfsproxy.

commit 6a903b5de907f56d49693c22a59c679077406594
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Mar 11 17:18:10 2014 +0000

    Massage the ChangeLog a bit.
---
 ChangeLog | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a3dab45..97b985b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,10 @@
 Changes in version 0.2.7 - UNRELEASED
- - obfs3 now uses twisted.internet.threads.deferToThread to process the key
-   exchange outside of the main event loop.  Patch by Yawning Angel.
+ - Support SOCKS5 instead of SOCKS4. Patch by Yawning Angel. Fixes #9221.
+ - obfs3 now uses twisted.internet.threads.deferToThread to process
+   the key exchange outside of the main event loop.
+   Patch by Yawning Angel. Fixes #11015.
  - Support gmpy2 if it is available in addition to gmpy.
    Patch by Yawning Angel.
- - Support SOCKS5 instead of SOCKS4.  Patch by Yawning Angel.
 
 
 Changes in version 0.2.6 - 2014-02-03

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/obfsproxy.git