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

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

04 May '12

commit b3787e1232593242d89d7e62357a73fb052fa20c Merge: dccbcc1 dd611d8 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 4 08:14:04 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 recommended-versions for 2.2.35-11
by erinn＠torproject.org 04 May '12

04 May '12

commit dd611d83e6285a7dc1bd3e1369e0fe0537e87f5c Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 4 08:13:44 2012 -0300 update recommended-versions for 2.2.35-11 --- 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 3859577..53554cf 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,9 +1,9 @@ [ -"2.2.35-10-MacOS-i386", -"2.2.35-10-MacOS-x86_64", -"2.2.35-9-Windows", -"2.2.35-10-Linux-i686", -"2.2.35-10-Linux-x86_64", +"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.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] update recommended-versions for 2.2.35-11
by erinn＠torproject.org 04 May '12

04 May '12

commit dd611d83e6285a7dc1bd3e1369e0fe0537e87f5c Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 4 08:13:44 2012 -0300 update recommended-versions for 2.2.35-11 --- 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 3859577..53554cf 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,9 +1,9 @@ [ -"2.2.35-10-MacOS-i386", -"2.2.35-10-MacOS-x86_64", -"2.2.35-9-Windows", -"2.2.35-10-Linux-i686", -"2.2.35-10-Linux-x86_64", +"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.3.12-alpha-2-MacOS-i386", "2.3.12-alpha-2-Windows", "2.3.12-alpha-2-Linux-i386",

1 0

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

04 May '12

commit b3787e1232593242d89d7e62357a73fb052fa20c Merge: dccbcc1 dd611d8 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 4 08:14:04 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/master] update recommended-versions for 2.2.35-11
by erinn＠torproject.org 04 May '12

04 May '12

commit dd611d83e6285a7dc1bd3e1369e0fe0537e87f5c Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 4 08:13:44 2012 -0300 update recommended-versions for 2.2.35-11 --- 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 3859577..53554cf 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,9 +1,9 @@ [ -"2.2.35-10-MacOS-i386", -"2.2.35-10-MacOS-x86_64", -"2.2.35-9-Windows", -"2.2.35-10-Linux-i686", -"2.2.35-10-Linux-x86_64", +"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.3.12-alpha-2-MacOS-i386", "2.3.12-alpha-2-Windows", "2.3.12-alpha-2-Linux-i386",

1 0

r25637: {website} bump tbbs to 2.2.35-11 and windows packages to 0.2.3.15-alph (website/trunk/include)
by Erinn Clark 04 May '12

04 May '12

Author: erinn Date: 2012-05-04 10:41:19 +0000 (Fri, 04 May 2012) New Revision: 25637 Modified: website/trunk/include/versions.wmi Log: bump tbbs to 2.2.35-11 and windows packages to 0.2.3.15-alpha Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-05-02 02:59:45 UTC (rev 25636) +++ website/trunk/include/versions.wmi 2012-05-04 10:41:19 UTC (rev 25637) @@ -2,18 +2,18 @@ <define-tag version-alpha whitespace=delete>0.2.3.15-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.2.35</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.3.12-alpha</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.3.15-alpha</define-tag> <define-tag version-win32-bundle-stable whitespace=delete>0.2.2.35</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.3.12-alpha</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.3.15-alpha</define-tag> <define-tag version-win32-bridge-bundle-stable whitespace=delete>0.2.2.35-<version-vidalia-stable></define-tag> <define-tag version-win32-relay-bundle-stable whitespace=delete>0.2.2.35-<version-vidalia-stable></define-tag> <define-tag version-win32-exit-bundle-stable whitespace=delete>0.2.2.35-<version-vidalia-stable>-2</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.3.12-alpha-<version-vidalia-stable></define-tag> -<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.3.12-alpha-<version-vidalia-stable></define-tag> -<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.3.12-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.3.15-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.3.15-alpha-<version-vidalia-stable></define-tag> +<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> @@ -27,7 +27,7 @@ <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-torbrowserbundle whitespace=delete>2.2.35-9</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.35-11</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-firefox whitespace=delete>12.0</define-tag> @@ -38,8 +38,8 @@ <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-10</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.35-10</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-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-firefox whitespace=delete>12.0</define-tag> @@ -48,8 +48,8 @@ <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-10</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-10</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-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>

1 0

[torbrowser/maint-2.2] Linux: fix libevent library names
by erinn＠torproject.org 03 May '12

03 May '12

commit 2a7b8a5ff0ea48b0c3b87582f8abf3c3ad44db9f Author: Erinn Clark <erinn(a)torproject.org> Date: Thu May 3 09:31:34 2012 -0300 Linux: fix libevent library names --- build-scripts/linux.mk | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 2834b1b..0584ec7 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -248,10 +248,11 @@ install-binaries: # zlib cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.6 $(LIBSDIR)/libz # Libevent - cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.5 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.5 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.5 \ + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.6 $(LIBEVENT)/libevent_core.so \ + $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.6 \ + $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.6 \ $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) + # libpng cp -d $(LIBPNG)/libpng15.so* $(LIBSDIR) # OpenSSL

1 0

[torbrowser/maint-2.3] Linux: fix libevent library names
by erinn＠torproject.org 03 May '12

03 May '12

commit 2a7b8a5ff0ea48b0c3b87582f8abf3c3ad44db9f Author: Erinn Clark <erinn(a)torproject.org> Date: Thu May 3 09:31:34 2012 -0300 Linux: fix libevent library names --- build-scripts/linux.mk | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 2834b1b..0584ec7 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -248,10 +248,11 @@ install-binaries: # zlib cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.6 $(LIBSDIR)/libz # Libevent - cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.5 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.5 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.5 \ + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.6 $(LIBEVENT)/libevent_core.so \ + $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.6 \ + $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.6 \ $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) + # libpng cp -d $(LIBPNG)/libpng15.so* $(LIBSDIR) # OpenSSL

1 0

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

03 May '12

commit dccbcc1314412c85efcb93a4b72e5174435deaa0 Merge: 61758f7 2a7b8a5 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu May 3 09:31:50 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)

1 0

[torbrowser/master] Linux: fix libevent library names
by erinn＠torproject.org 03 May '12

03 May '12

commit 2a7b8a5ff0ea48b0c3b87582f8abf3c3ad44db9f Author: Erinn Clark <erinn(a)torproject.org> Date: Thu May 3 09:31:34 2012 -0300 Linux: fix libevent library names --- build-scripts/linux.mk | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 2834b1b..0584ec7 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -248,10 +248,11 @@ install-binaries: # zlib cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.6 $(LIBSDIR)/libz # Libevent - cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.5 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.5 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.5 \ + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.6 $(LIBEVENT)/libevent_core.so \ + $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.6 \ + $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.6 \ $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) + # libpng cp -d $(LIBPNG)/libpng15.so* $(LIBSDIR) # OpenSSL

1 0