[Pkg-privacy-commits] [obfsproxy] 03/11: Merge branch 'master' into tpo-quantal-backport

[Ximin Luo]

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

infinity0 pushed a commit to branch tpo-quantal-backport
in repository obfsproxy.

commit 8cf4f9cb92e66861fea8a685be365b8f3971fa17
Merge: 34b88f1 ea022ae
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Thu Apr 11 09:53:40 2013 +0000

    Merge branch 'master' into tpo-quantal-backport

 debian/changelog                                   |  6 +++
 ...ibility-hack-to-the-registred-entry-point.patch | 59 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 66 insertions(+)

diff --cc debian/changelog
index 886113b,64951f0..dbd0852
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ obfsproxy (0.2.1-2) experimental; urgency=low
+ 
+   * Add a patch to fix the C-obfsproxy compatilibity hack.
+ 
+  -- Jérémy Bobbio <lunar at debian.org>  Thu, 11 Apr 2013 09:39:20 +0000
+ 
 +obfsproxy (0.2.1-1~quantal+1) quantal-backport; urgency=low
 +
 +  * Build for quantal-backport.
 +
 + -- Jérémy Bobbio <lunar at debian.org>  Thu, 11 Apr 2013 08:31:17 +0000
 +
  obfsproxy (0.2.1-1) experimental; urgency=low
  
    * New upstream release:

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