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

commit 29be6074b338411fe7dc17534ebabe202f3a9ef9 Merge: 840d6cf 3d77ba8 Author: George Kadianakis desnacked@riseup.net Date: Tue Apr 17 15:31:34 2012 +0200

Merge branch 'bug5586'

Conflicts: ChangeLog

ChangeLog | 2 ++ src/network.c | 1 - 2 files changed, 2 insertions(+), 1 deletions(-)

diff --cc ChangeLog index a818f34,b2722d4..af3f391 --- a/ChangeLog +++ b/ChangeLog @@@ -1,6 -1,6 +1,8 @@@ 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.

Changes in version 0.1.3 - 2012-04-03