May 2012 - tor-commits - lists.torproject.org

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 13 May '12

13 May '12

commit 53fb950252095b014eb2a003e568a577d993b9f3 Merge: 06352bd 8e41d82 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat May 12 20:10:03 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)

1 0

[torbrowser/maint-2.2] update recommend-versions for 2.2.35-12
by erinn＠torproject.org 13 May '12

13 May '12

commit 8e41d820564a597f69f92050035b2ba7e350e16b Author: Erinn Clark <erinn(a)torproject.org> Date: Sat May 12 20:09:38 2012 -0300 update recommend-versions for 2.2.35-12 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 53554cf..24bec3b 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,9 +1,9 @@ [ -"2.2.35-11-MacOS-i386", -"2.2.35-11-MacOS-x86_64", -"2.2.35-11-Windows", -"2.2.35-11-Linux-i686", -"2.2.35-11-Linux-x86_64", +"2.2.35-12-MacOS-i386", +"2.2.35-12-MacOS-x86_64", +"2.2.35-12-Windows", +"2.2.35-12-Linux-i686", +"2.2.35-12-Linux-x86_64", "2.3.12-alpha-2-MacOS-i386", "2.3.12-alpha-2-Windows", "2.3.12-alpha-2-Linux-i386",

1 0

[torbrowser/master] update recommend-versions for 2.2.35-12
by erinn＠torproject.org 13 May '12

13 May '12

commit 8e41d820564a597f69f92050035b2ba7e350e16b Author: Erinn Clark <erinn(a)torproject.org> Date: Sat May 12 20:09:38 2012 -0300 update recommend-versions for 2.2.35-12 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 53554cf..24bec3b 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,9 +1,9 @@ [ -"2.2.35-11-MacOS-i386", -"2.2.35-11-MacOS-x86_64", -"2.2.35-11-Windows", -"2.2.35-11-Linux-i686", -"2.2.35-11-Linux-x86_64", +"2.2.35-12-MacOS-i386", +"2.2.35-12-MacOS-x86_64", +"2.2.35-12-Windows", +"2.2.35-12-Linux-i686", +"2.2.35-12-Linux-x86_64", "2.3.12-alpha-2-MacOS-i386", "2.3.12-alpha-2-Windows", "2.3.12-alpha-2-Linux-i386",

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 13 May '12

13 May '12

commit 53fb950252095b014eb2a003e568a577d993b9f3 Merge: 06352bd 8e41d82 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat May 12 20:10:03 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)

1 0

r25648: {website} bump tbbs and vidalia bundles for new packages with openssl (website/trunk/include)
by Erinn Clark 13 May '12

13 May '12

Author: erinn Date: 2012-05-13 00:08:43 +0000 (Sun, 13 May 2012) New Revision: 25648 Modified: website/trunk/include/versions.wmi Log: bump tbbs and vidalia bundles for new packages with openssl 1.0.1c Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-05-11 02:24:06 UTC (rev 25647) +++ website/trunk/include/versions.wmi 2012-05-13 00:08:43 UTC (rev 25648) @@ -16,20 +16,20 @@ <define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.3.15-alpha-<version-vidalia-stable></define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.2.35</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.3.12-alpha</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.3.15-alpha</define-tag> <define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.2.35</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.3.12-alpha</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.3.15-alpha</define-tag> <define-tag version-osx-x86-stable whitespace=delete>0.2.2.35</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.3.12-alpha</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.3.15-alpha</define-tag> <define-tag version-osx-ppc-stable whitespace=delete>0.2.2.35</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.12-alpha</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.15-alpha</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.2.35-11</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.35-12</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> -<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.18-stable, zlib-1.2.6, openssl-1.0.1b</define-tag> +<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.19-stable, zlib-1.2.7, openssl-1.0.1c</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>12.0</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> @@ -38,18 +38,18 @@ <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> <define-tag version-torbrowserbundlealpha whitespace=delete>2.3.12-alpha-2</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.35-11</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.35-11</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.35-12</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.35-12</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> -<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.18-stable, zlib-1.2.6, openssl-1.0.1b</define-tag> +<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.19-stable, zlib-1.2.7, openssl-1.0.1c</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>12.0</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.17</define-tag> <define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.3.12-alpha-2</define-tag> <define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.3.12-alpha-2</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.35-11</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-11</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.35-12</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-12</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>12.0</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> @@ -65,35 +65,35 @@ <define-tag version-androidbundle-libevent whitespace=delete>libevent-1.4.12-stable</define-tag> <define-tag package-androidbundle-alpha whitespace=delete>dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk</define-tag> -<define-tag package-win32-stable whitespace=delete>../dist/win32/tor-<version-win32-stable>-win32.exe</define-tag> -<define-tag package-win32-alpha whitespace=delete>../dist/win32/tor-<version-win32-alpha>-win32.exe</define-tag> +<define-tag package-win32-stable whitespace=delete>../dist/win32/tor-<version-win32-stable>-win32-1.exe</define-tag> +<define-tag package-win32-alpha whitespace=delete>../dist/win32/tor-<version-win32-alpha>-win32-1.exe</define-tag> -<define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.17.exe</define-tag> +<define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.17-1.exe</define-tag> <define-tag package-win32-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-bundle-stable></define-tag> -<define-tag file-win32-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.17.exe</define-tag> +<define-tag file-win32-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.17-1.exe</define-tag> <define-tag package-win32-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> -<define-tag file-win32-bridge-bundle-stable whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-stable>-0.2.17.exe</define-tag> +<define-tag file-win32-bridge-bundle-stable whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-stable>-0.2.17-1.exe</define-tag> <define-tag package-win32-bridge-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-bridge-bundle-stable></define-tag> -<define-tag file-win32-bridge-bundle-alpha whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-alpha>-0.2.17.exe</define-tag> +<define-tag file-win32-bridge-bundle-alpha whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-alpha>-0.2.17-1.exe</define-tag> <define-tag package-win32-bridge-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-bridge-bundle-alpha></define-tag> -<define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-stable>-0.2.17.exe</define-tag> +<define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-stable>-0.2.17-1.exe</define-tag> <define-tag package-win32-relay-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-relay-bundle-stable></define-tag> -<define-tag file-win32-relay-bundle-alpha whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-alpha>-0.2.17.exe</define-tag> +<define-tag file-win32-relay-bundle-alpha whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-alpha>-0.2.17-1.exe</define-tag> <define-tag package-win32-relay-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-relay-bundle-alpha></define-tag> -<define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-stable>-0.2.17.exe</define-tag> +<define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-stable>-0.2.17-1.exe</define-tag> <define-tag package-win32-exit-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-exit-bundle-stable></define-tag> -<define-tag file-win32-exit-bundle-alpha whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-alpha>-0.2.17.exe</define-tag> +<define-tag file-win32-exit-bundle-alpha whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-alpha>-0.2.17-1.exe</define-tag> <define-tag package-win32-exit-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-exit-bundle-alpha></define-tag> -<define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.17-i386.dmg</define-tag> +<define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.17-i386-1.dmg</define-tag> <define-tag package-osx-x86-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-osx-x86-bundle-stable></define-tag> <define-tag file-osx-x86-bundle-alpha whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-alpha>-0.2.17-i386.dmg</define-tag> <define-tag package-osx-x86-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-osx-x86-bundle-alpha></define-tag> -<define-tag package-osx-ppc-bundle-stable whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-stable>-0.2.17-ppc.dmg</define-tag> +<define-tag package-osx-ppc-bundle-stable whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-stable>-0.2.17-ppc-1.dmg</define-tag> <define-tag package-osx-ppc-bundle-alpha whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-alpha>-0.2.17-ppc.dmg</define-tag> <define-tag package-osx-x86-stable whitespace=delete>../dist/osx-x86/Tor-<version-osx-stable>-i386-Bundle.dmg</define-tag>

1 0

[torbrowser/maint-2.2] update zlib library name in linux makefile
by erinn＠torproject.org 12 May '12

12 May '12

commit a90ae13ca9094aaa8527e7c78446f4c2580d0aab Author: Erinn Clark <erinn(a)torproject.org> Date: Sat May 12 10:43:29 2012 -0300 update zlib library name in linux makefile --- build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 8e424cb..d3a2697 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -246,7 +246,7 @@ install-binaries: cp -d $(QT)/libQtNetwork.so* $(LIBSDIR) cp -d $(QT)/libQtXml.so* $(LIBSDIR) # zlib - cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.6 $(LIBSDIR)/libz + cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.7 $(LIBSDIR)/libz # Libevent cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.7 $(LIBEVENT)/libevent_core.so \ $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.7 \

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 12 May '12

12 May '12

commit 06352bd7c7bf2bd240ca423d6c700606f6fc3e96 Merge: 85b9503 a90ae13 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat May 12 10:43:43 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torbrowser/maint-2.3] update zlib library name in linux makefile
by erinn＠torproject.org 12 May '12

12 May '12

commit a90ae13ca9094aaa8527e7c78446f4c2580d0aab Author: Erinn Clark <erinn(a)torproject.org> Date: Sat May 12 10:43:29 2012 -0300 update zlib library name in linux makefile --- build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 8e424cb..d3a2697 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -246,7 +246,7 @@ install-binaries: cp -d $(QT)/libQtNetwork.so* $(LIBSDIR) cp -d $(QT)/libQtXml.so* $(LIBSDIR) # zlib - cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.6 $(LIBSDIR)/libz + cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.7 $(LIBSDIR)/libz # Libevent cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.7 $(LIBEVENT)/libevent_core.so \ $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.7 \

1 0

[torbrowser/master] update zlib library name in linux makefile
by erinn＠torproject.org 12 May '12

12 May '12

commit a90ae13ca9094aaa8527e7c78446f4c2580d0aab Author: Erinn Clark <erinn(a)torproject.org> Date: Sat May 12 10:43:29 2012 -0300 update zlib library name in linux makefile --- build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 8e424cb..d3a2697 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -246,7 +246,7 @@ install-binaries: cp -d $(QT)/libQtNetwork.so* $(LIBSDIR) cp -d $(QT)/libQtXml.so* $(LIBSDIR) # zlib - cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.6 $(LIBSDIR)/libz + cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.7 $(LIBSDIR)/libz # Libevent cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.7 $(LIBEVENT)/libevent_core.so \ $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.7 \

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 12 May '12

12 May '12

commit 06352bd7c7bf2bd240ca423d6c700606f6fc3e96 Merge: 85b9503 a90ae13 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat May 12 10:43:43 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0