[Pkg-privacy-commits] [obfsproxy] 244/353: Merge branch 'yawning_gmpy2'

[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 04915adf73596773a67ed295464914b34b4abd9f
Merge: 5e33045 851560f
Author: George Kadianakis <desnacked at riseup.net>
Date:   Sun Mar 2 12:35:54 2014 +0000

    Merge branch 'yawning_gmpy2'
    
    Conflicts:
    	ChangeLog

 ChangeLog                  |  2 ++
 obfsproxy/common/modexp.py | 24 ++++++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --cc ChangeLog
index 1f910cc,53791f2..8fb2b21
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,6 +1,8 @@@
  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 gmpy2 if it is available in addition to gmpy.
+    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