summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYawning Angel <yawning@torproject.org>2015-04-23 00:32:25 +0000
committerYawning Angel <yawning@torproject.org>2015-04-23 00:32:25 +0000
commit37a709d8b4fec837c0c88c495e7ea926953d974f (patch)
tree0f2f53fc139eb10dc7cc33041d3818207eef9647
parent3540313e53fc851c833d98281fd64c8fd32effeb (diff)
Bump the version to 0.0.6-dev, signifying development towards 0.0.6.
-rw-r--r--ChangeLog2
-rw-r--r--obfs4proxy/obfs4proxy.go2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3569518..15de989 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+Changes in version 0.0.6 - UNRELEASED:
+
Changes in version 0.0.5 - 2015-04-15:
- Go vet/fmt fixes, and misc. code cleanups. Patches by mvdan.
- Changed the go.net import path to the new location (golang.org/x/net).
diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go
index 5d13b32..5f7f171 100644
--- a/obfs4proxy/obfs4proxy.go
+++ b/obfs4proxy/obfs4proxy.go
@@ -51,7 +51,7 @@ import (
)
const (
- obfs4proxyVersion = "0.0.5"
+ obfs4proxyVersion = "0.0.6-dev"
obfs4proxyLogFile = "obfs4proxy.log"
socksAddr = "127.0.0.1:0"
)