[tor-commits] [obfsproxy/master] Merge branch 'bug5141'

[asn@xxxxxxxxxxxxxx]

commit 60451a4aa8fdabf720216993b358bc5929bfd6e9
Merge: 5d9ac64 ee63d3f
Author: George Kadianakis <desnacked@xxxxxxxxxx>
Date:   Tue Apr 17 15:46:45 2012 +0200

    Merge branch 'bug5141'
    
    Conflicts:
    	ChangeLog

 ChangeLog             |    2 +
 src/protocols/obfs2.c |  107 ++++++++++++++++++++++++++----------------------
 2 files changed, 60 insertions(+), 49 deletions(-)

diff --cc ChangeLog
index af3f391,ae2ee92..8b99ee9
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,6 +1,10 @@@
  Changes in version 0.1.4 - <not yet released>
 + - Fix 'obfsproxy --version' when called outside of a git
 +   repository. Fixes bug 5560.
 + - Fix assertion failure when connecting to a SOCKS destination. Fixes
 +   bug #5586.
+  - Fix crash when parsing obfs2 command line arguments. Fixes bug
+    #5141.
  
  
  Changes in version 0.1.3 - 2012-04-03

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits