Merge branch 'master' of https://git.torproject.org/pluggable-transpo…

…rts/obfs4
48ca · May 11, 2015 · 73113c5 · 73113c5
2 parents 7af8c3f + 37a709d
commit 73113c5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -51,7 +51,7 @@ import (
 )
 
 const (
-	obfs4proxyVersion = "0.0.5"
+	obfs4proxyVersion = "0.0.6-dev"
 	obfs4proxyLogFile = "obfs4proxy.log"
 	socksAddr         = "127.0.0.1:0"
 )