March 2015 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.6
by nickm＠torproject.org 10 Mar '15

10 Mar '15

commit 1af67d7f72470cec1de5e2a75186edc3b3accfbe Merge: 7c9be64 24c031b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 19:47:12 2015 -0400 Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.6 changes/bug15205 | 5 +++++ src/common/compat.h | 12 ++++++++++++ 2 files changed, 17 insertions(+)

1 0

[tor/master] bump 0.2.6 to 0.2.6.4-rc-dev
by nickm＠torproject.org 10 Mar '15

10 Mar '15

commit 99b59dee7046b04854ac263a1cf810dceb80df12 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 10 08:20:47 2015 -0400 bump 0.2.6 to 0.2.6.4-rc-dev --- 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 aaad11f..f04abfb 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.6.3-alpha-dev]) +AC_INIT([tor],[0.2.6.4-rc-dev]) 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 24757a8..4a0350f 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.6.3-alpha-dev" +!define VERSION "0.2.6.4-rc-dev" !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 e3a5205..4d7a878 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.6.3-alpha-dev" +#define VERSION "0.2.6.4-rc-dev"

1 0

[tor/master] Merge commit 'origin/maint-0.2.6^'
by nickm＠torproject.org 10 Mar '15

10 Mar '15

commit e732ec295db714d84cc419be69764b10a302b633 Merge: 59f4c41 1af67d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 10 08:36:53 2015 -0400 Merge commit 'origin/maint-0.2.6^' changes/bug15205 | 5 +++++ src/common/compat.h | 12 ++++++++++++ 2 files changed, 17 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'
by nickm＠torproject.org 10 Mar '15

10 Mar '15

commit bc6dcac353de0e30e7b47f77cd990b50af73e6ca Merge: e732ec2 99b59de Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 10 08:37:08 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6'

1 0

[tor/maint-0.2.6] bump 0.2.6 to 0.2.6.4-rc-dev
by nickm＠torproject.org 10 Mar '15

10 Mar '15

commit 99b59dee7046b04854ac263a1cf810dceb80df12 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 10 08:20:47 2015 -0400 bump 0.2.6 to 0.2.6.4-rc-dev --- 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 aaad11f..f04abfb 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.6.3-alpha-dev]) +AC_INIT([tor],[0.2.6.4-rc-dev]) 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 24757a8..4a0350f 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.6.3-alpha-dev" +!define VERSION "0.2.6.4-rc-dev" !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 e3a5205..4d7a878 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.6.3-alpha-dev" +#define VERSION "0.2.6.4-rc-dev"

1 0

[tor/release-0.2.6] Merge branch 'maint-0.2.6' into release-0.2.6
by nickm＠torproject.org 10 Mar '15

10 Mar '15

commit 74f861b295fc59ae2567b5ec78e2a46d66e44630 Merge: 0c2e4ae 99b59de Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 10 08:21:53 2015 -0400 Merge branch 'maint-0.2.6' into release-0.2.6 Conflicts: configure.ac contrib/win32build/tor-mingw.nsi.in src/win32/orconfig.h configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.6] bump 0.2.6 to 0.2.6.4-rc-dev
by nickm＠torproject.org 10 Mar '15

10 Mar '15

commit 99b59dee7046b04854ac263a1cf810dceb80df12 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 10 08:20:47 2015 -0400 bump 0.2.6 to 0.2.6.4-rc-dev --- 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 aaad11f..f04abfb 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.6.3-alpha-dev]) +AC_INIT([tor],[0.2.6.4-rc-dev]) 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 24757a8..4a0350f 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.6.3-alpha-dev" +!define VERSION "0.2.6.4-rc-dev" !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 e3a5205..4d7a878 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.6.3-alpha-dev" +#define VERSION "0.2.6.4-rc-dev"

1 0

[tor-browser-bundle/master] Bug 15023: Adding Linux MAR tools to SHA256 sums
by gk＠torproject.org 10 Mar '15

10 Mar '15

commit 8fc54b8ab6e96ff8fc722066bc7756b25d23619f Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 10 11:34:07 2015 +0000 Bug 15023: Adding Linux MAR tools to SHA256 sums --- gitian/mkbundle-linux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index c71981f..f1ef984 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -257,7 +257,7 @@ then mkdir -p $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ cp -a build/out/tor-browser-linux*xz* $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 - #cp -a inputs/mar-tools-linux*.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 + cp -a inputs/mar-tools-linux*.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 cp -a inputs/*debug.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 touch inputs/bundle-linux.gbuilt else

1 0

[translation/tor-launcher-progress_completed] Update translations for tor-launcher-progress_completed
by translation＠torproject.org 10 Mar '15

10 Mar '15

commit f7255ad30e1be4d620bf0722b723c57fab1739a1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 10 10:15:35 2015 +0000 Update translations for tor-launcher-progress_completed --- fr/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/progress.dtd b/fr/progress.dtd index 936d220..d028d4c 100644 --- a/fr/progress.dtd +++ b/fr/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "État de Tor"> <!ENTITY torprogress.openSettings "Ouvrir les paramètres"> <!ENTITY torprogress.heading "Connexion au réseau Tor"> -<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que la connexion au réseau Tor est établie."> +<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que la connexion au réseau Tor s'établit.">

1 0

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 10 Mar '15

10 Mar '15

commit 2457ea6ead42da851e8d03e8cccc1f14fea9228b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 10 10:15:31 2015 +0000 Update translations for tor-launcher-progress --- fr/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/progress.dtd b/fr/progress.dtd index 936d220..d028d4c 100644 --- a/fr/progress.dtd +++ b/fr/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "État de Tor"> <!ENTITY torprogress.openSettings "Ouvrir les paramètres"> <!ENTITY torprogress.heading "Connexion au réseau Tor"> -<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que la connexion au réseau Tor est établie."> +<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que la connexion au réseau Tor s'établit.">

1 0