July 2014 - tor-commits - lists.torproject.org

[tor/master] bump to 0.2.5.6-alpha
by arma＠torproject.org 28 Jul '14

28 Jul '14

commit 77609161f37dc37420f240410f2f546fc431cb8c Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jul 28 04:13:18 2014 -0400 bump to 0.2.5.6-alpha --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 1d8cfa7..c37f154 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.5.5-alpha-dev]) +AC_INIT([tor],[0.2.5.6-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index f7c025e..5d94fd9 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.5.5-alpha-dev" +!define VERSION "0.2.5.6-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 4698a2c..8c2472c 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.5.5-alpha-dev" +#define VERSION "0.2.5.6-alpha"

1 0

[tor/master] Merge branch 'maint-0.2.5'
by arma＠torproject.org 28 Jul '14

28 Jul '14

commit e3f4a96528ad52c480a360bf7782446f5a06f622 Merge: 6c4a26b 7760916 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jul 28 04:14:39 2014 -0400 Merge branch 'maint-0.2.5' Conflicts: configure.ac contrib/win32build/tor-mingw.nsi.in src/win32/orconfig.h

1 0

[tor/master] bump to 0.2.4.23
by arma＠torproject.org 28 Jul '14

28 Jul '14

commit fcbb21b414947d8ad7e4298d3952b84d8005dabc Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jul 28 04:07:36 2014 -0400 bump to 0.2.4.23 --- configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 1463af7..3456013 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.22-dev]) +AC_INIT([tor],[0.2.4.23]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index d72072e..23a01b4 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.22-dev" +!define VERSION "0.2.4.23" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 9e0a41a..c86e2b0 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.22-dev" +#define VERSION "0.2.4.23"

1 0

[tor/master] Merge branch 'maint-0.2.4' into maint-0.2.5
by arma＠torproject.org 28 Jul '14

28 Jul '14

commit 4467e5ce56e657e6063c77b8399a30416084b0da Merge: 29a82b5 fcbb21b Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jul 28 04:09:37 2014 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5

1 0

[tor/maint-0.2.5] bump to 0.2.5.6-alpha
by arma＠torproject.org 28 Jul '14

28 Jul '14

commit 77609161f37dc37420f240410f2f546fc431cb8c Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jul 28 04:13:18 2014 -0400 bump to 0.2.5.6-alpha --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 1d8cfa7..c37f154 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.5.5-alpha-dev]) +AC_INIT([tor],[0.2.5.6-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index f7c025e..5d94fd9 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.5.5-alpha-dev" +!define VERSION "0.2.5.6-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 4698a2c..8c2472c 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.5.5-alpha-dev" +#define VERSION "0.2.5.6-alpha"

1 0

[meek/master] Rearrange client torrc.
by dcf＠torproject.org 28 Jul '14

28 Jul '14

commit e4245d87b2d64b25eb4c1868d2b78c25b940607f Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 28 01:06:52 2014 -0700 Rearrange client torrc. --- meek-client/torrc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meek-client/torrc b/meek-client/torrc index 6ed137b..ffd2be9 100644 --- a/meek-client/torrc +++ b/meek-client/torrc @@ -1,12 +1,13 @@ +DataDirectory datadir UseBridges 1 # Socks4Proxy localhost:1080 # Socks5Proxy localhost:1080 # HTTPSProxy localhost:8080 -# Bridge meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com -# ClientTransportPlugin meek exec ./meek-client --log meek-client.log Bridge meek 0.0.2.0:1 -# ClientTransportPlugin meek exec ./meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com --log meek-client.log --helper 127.0.0.1:7000 ClientTransportPlugin meek exec ./meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com --log meek-client.log -DataDirectory datadir + +# With tor 0.2.5 you can do it this way: +# Bridge meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com +# ClientTransportPlugin meek exec ./meek-client --log meek-client.log

1 0

[meek/master] Add CloudFront example to client torrc.
by dcf＠torproject.org 28 Jul '14

28 Jul '14

commit 7284693d057b53ff156f0e4cb3e145e3356dcec7 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 28 01:07:45 2014 -0700 Add CloudFront example to client torrc. --- meek-client/torrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meek-client/torrc b/meek-client/torrc index ffd2be9..ec93d7b 100644 --- a/meek-client/torrc +++ b/meek-client/torrc @@ -7,7 +7,9 @@ UseBridges 1 Bridge meek 0.0.2.0:1 ClientTransportPlugin meek exec ./meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com --log meek-client.log +# ClientTransportPlugin meek exec ./meek-client --url=https://d2zfqthxsdq309.cloudfront.net/ --front=a0.awsstatic.com --log meek-client.log # With tor 0.2.5 you can do it this way: # Bridge meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com +# Bridge meek 0.0.2.0:2 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com # ClientTransportPlugin meek exec ./meek-client --log meek-client.log

1 0

[tor/maint-0.2.5] bump to 0.2.4.23
by arma＠torproject.org 28 Jul '14

28 Jul '14

commit fcbb21b414947d8ad7e4298d3952b84d8005dabc Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jul 28 04:07:36 2014 -0400 bump to 0.2.4.23 --- configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 1463af7..3456013 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.22-dev]) +AC_INIT([tor],[0.2.4.23]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index d72072e..23a01b4 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.22-dev" +!define VERSION "0.2.4.23" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 9e0a41a..c86e2b0 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.22-dev" +#define VERSION "0.2.4.23"

1 0

[tor/maint-0.2.5] Merge branch 'maint-0.2.4' into maint-0.2.5
by arma＠torproject.org 28 Jul '14

28 Jul '14

commit 4467e5ce56e657e6063c77b8399a30416084b0da Merge: 29a82b5 fcbb21b Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jul 28 04:09:37 2014 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5

1 0

[tor/release-0.2.4] bump to 0.2.4.23
by arma＠torproject.org 28 Jul '14

28 Jul '14

commit fcbb21b414947d8ad7e4298d3952b84d8005dabc Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jul 28 04:07:36 2014 -0400 bump to 0.2.4.23 --- configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 1463af7..3456013 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.22-dev]) +AC_INIT([tor],[0.2.4.23]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index d72072e..23a01b4 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.22-dev" +!define VERSION "0.2.4.23" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 9e0a41a..c86e2b0 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.22-dev" +#define VERSION "0.2.4.23"

1 0