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

[torbrowser/maint-2.3] Merge branch 'maint-2.3'
by erinn＠torproject.org 07 Sep '12

07 Sep '12

commit fdae985c88bee3d2eff2f91a5686519aa7a9667b Merge: 9e6ba63 e0f7cf9 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Aug 2 16:29:24 2012 -0700 Merge branch 'maint-2.3' ...solate-the-Image-Cache-per-url-bar-domain.patch | 32 ++++++++++++-------- 1 files changed, 19 insertions(+), 13 deletions(-)

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.3'
by erinn＠torproject.org 07 Sep '12

07 Sep '12

commit b05e24326c4ec9826231cfafdce314e5659149c5 Merge: 1f4bfd8 fe62dab Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Jul 31 18:17:43 2012 -0700 Merge branch 'maint-2.3' build-scripts/config/prefs.js | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.3'
by erinn＠torproject.org 07 Sep '12

07 Sep '12

commit 9e6ba63ee4f141f9f3bf5f82741e659f8e76a5c0 Merge: d716d11 7f0cf43 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Aug 2 07:57:49 2012 +0100 Merge branch 'maint-2.3' build-scripts/config/alpha/torrc-obfsproxy-linux | 31 ++++++++++++++++ build-scripts/config/alpha/torrc-obfsproxy-osx | 31 ++++++++++++++++ .../config/alpha/vidalia.conf.ff-obfsproxy | 15 -------- .../config/alpha/vidalia.conf.ff-obfsproxy-linux | 21 +++++++++++ .../config/alpha/vidalia.conf.ff-obfsproxy-osx | 20 +++++++++++ build-scripts/linux-alpha.mk | 37 +++++++++++++++++++- build-scripts/osx-alpha.mk | 34 +++++++++++++++++- build-scripts/windows-alpha.mk | 35 +++++++++++++++++-- 8 files changed, 204 insertions(+), 20 deletions(-)

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.3'
by erinn＠torproject.org 07 Sep '12

07 Sep '12

commit d716d11ec10af4c3a04ae68a85cf16f675a44f8a Merge: b05e243 d8e36b1 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Aug 1 14:31:28 2012 -0700 Merge branch 'maint-2.3' ...0-Add-a-redirect-API-for-HTTPS-Everywhere.patch | 346 ++++++++ ...solate-the-Image-Cache-per-url-bar-domain.patch | 904 ++++++++++++++++++++ 2 files changed, 1250 insertions(+), 0 deletions(-)

1 0

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

07 Sep '12

commit 1f4bfd86f6d351be637b5ee0a8aa78bce22e2090 Merge: 0087524 fb8c3ea Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Jul 31 18:01:19 2012 -0700 Merge branch 'maint-2.2' build-scripts/config/prefs.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.3'
by erinn＠torproject.org 07 Sep '12

07 Sep '12

commit c85e20f2cc40dcc9fdae18c2cf482e575766dd10 Merge: d486476 1e3b8a5 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 6 02:16:43 2012 +0100 Merge branch 'maint-2.3' README.LINUX-2.3 | 2 +- README.OSX-2.3 | 2 +- README.WIN-2.3 | 2 +- build-scripts/linux-alpha.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/versions-alpha.mk | 2 +- build-scripts/windows-alpha.mk | 2 +- changelog.linux-2.3 | 3 ++- changelog.osx-2.3 | 3 ++- changelog.windows-2.3 | 3 ++- 10 files changed, 13 insertions(+), 10 deletions(-)

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.3'
by erinn＠torproject.org 07 Sep '12

07 Sep '12

commit 566fd4a74298d59eee2e367753b49c23074d10cd Merge: c85e20f a190866 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 6 02:21:54 2012 +0100 Merge branch 'maint-2.3' build-scripts/versions-alpha.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.3'
by erinn＠torproject.org 07 Sep '12

07 Sep '12

commit 71dd3ae3159edb99ae3e50dac865389e558be2ff Merge: fdae985 f2be42f Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Aug 4 12:46:41 2012 -0700 Merge branch 'maint-2.3' ...solate-the-Image-Cache-per-url-bar-domain.patch | 910 -------------------- 1 files changed, 0 insertions(+), 910 deletions(-)

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.3'
by erinn＠torproject.org 07 Sep '12

07 Sep '12

commit a82e8fb15132a8e71b3f21a209999b218f989e4e Merge: 71dd3ae ba5724c Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 4 21:05:40 2012 +0100 Merge branch 'maint-2.3' build-scripts/linux-alpha.mk | 5 +---- build-scripts/osx-alpha.mk | 7 ++----- build-scripts/versions-alpha.mk | 2 +- build-scripts/windows-alpha.mk | 5 +---- 4 files changed, 5 insertions(+), 14 deletions(-)

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.3'
by erinn＠torproject.org 07 Sep '12

07 Sep '12

commit b090e92a5514b8d9f65ca24a5ca733f2451b3b7e Merge: 566fd4a 1d65c88 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 11 08:52:43 2012 +0100 Merge branch 'maint-2.3' build-scripts/linux-alpha.mk | 5 +++-- build-scripts/osx-alpha.mk | 1 + build-scripts/windows-alpha.mk | 1 + 3 files changed, 5 insertions(+), 2 deletions(-)

1 0