- tor-commits - lists.torproject.org

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

07 Jun '12

commit bf31618d8680a0e780a448324cdafcb420365a7f Merge: ca4d7bc 43f99f2 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Jun 7 18:09:00 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/osx.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)

1 0

[torbrowser/maint-2.2] fix install-torbutton target. you must make a directory before trying to copy a file into it.
by erinn＠torproject.org 07 Jun '12

07 Jun '12

commit 43f99f2864b593182f362aa7fd03843b73f1231d Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Jun 7 18:08:21 2012 -0300 fix install-torbutton target. you must make a directory before trying to copy a file into it. --- build-scripts/osx.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 857408b..0cca41d 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -354,6 +354,7 @@ ifneq ($(LANGCODE), en-US) endif install-torbutton: torbutton.xpi + mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/ cp torbutton.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.xpi install-httpseverywhere: httpseverywhere.xpi

1 0

[torbrowser/maint-2.3] fix install-torbutton target. you must make a directory before trying to copy a file into it.
by erinn＠torproject.org 07 Jun '12

07 Jun '12

commit 43f99f2864b593182f362aa7fd03843b73f1231d Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Jun 7 18:08:21 2012 -0300 fix install-torbutton target. you must make a directory before trying to copy a file into it. --- build-scripts/osx.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 857408b..0cca41d 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -354,6 +354,7 @@ ifneq ($(LANGCODE), en-US) endif install-torbutton: torbutton.xpi + mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/ cp torbutton.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.xpi install-httpseverywhere: httpseverywhere.xpi

1 0

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

07 Jun '12

commit bf31618d8680a0e780a448324cdafcb420365a7f Merge: ca4d7bc 43f99f2 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Jun 7 18:09:00 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/osx.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)

1 0

[torbrowser/master] fix install-torbutton target. you must make a directory before trying to copy a file into it.
by erinn＠torproject.org 07 Jun '12

07 Jun '12

commit 43f99f2864b593182f362aa7fd03843b73f1231d Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Jun 7 18:08:21 2012 -0300 fix install-torbutton target. you must make a directory before trying to copy a file into it. --- build-scripts/osx.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 857408b..0cca41d 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -354,6 +354,7 @@ ifneq ($(LANGCODE), en-US) endif install-torbutton: torbutton.xpi + mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/ cp torbutton.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.xpi install-httpseverywhere: httpseverywhere.xpi

1 0

[torbrowser/maint-2.2] add torbutton 1.4.6 to the changelog
by erinn＠torproject.org 07 Jun '12

07 Jun '12

commit af0a83800993bd69a7d7dd215a5a792704532ec3 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Jun 7 18:00:51 2012 -0300 add torbutton 1.4.6 to the changelog --- changelog.linux-2.2 | 1 + changelog.osx-2.2 | 1 + changelog.windows-2.2 | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index c4adaaf..c8db556 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -4,6 +4,7 @@ Tor Browser Bundle (2.2.37-1); suite=linux * Switch Firefox to 10.0.5esr, since we will be tracking the extended stable releases for TBB stable versions * Update Vidalia to 0.2.19 + * Update Torbutton to 1.4.6 * Update NoScript to 2.4.4 -- Erinn Clark <erinn(a)torproject.org> Thu Jun 7 17:51:01 BRT 2012 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index c70d193..932ac47 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -4,6 +4,7 @@ Tor Browser Bundle (2.2.37-1); suite=osx * Switch Firefox to 10.0.5esr, since we will be tracking the extended stable releases for TBB stable versions * Update Vidalia to 0.2.19 + * Update Torbutton to 1.4.6 * Update NoScript to 2.4.4 -- Erinn Clark <erinn(a)torproject.org> Thu Jun 7 17:50:58 BRT 2012 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index c2fcd48..1c16910 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -4,6 +4,7 @@ Tor Browser Bundle (2.2.37-1); suite=windows * Switch Firefox to 10.0.5esr, since we will be tracking the extended stable releases for TBB stable versions * Update Vidalia to 0.2.19 + * Update Torbutton to 1.4.6 * Update NoScript to 2.4.4 -- Erinn Clark <erinn(a)torproject.org> Thu Jun 7 17:51:04 BRT 2012

1 0

[torbrowser/maint-2.3] add torbutton 1.4.6 to the changelog
by erinn＠torproject.org 07 Jun '12

07 Jun '12

commit af0a83800993bd69a7d7dd215a5a792704532ec3 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Jun 7 18:00:51 2012 -0300 add torbutton 1.4.6 to the changelog --- changelog.linux-2.2 | 1 + changelog.osx-2.2 | 1 + changelog.windows-2.2 | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index c4adaaf..c8db556 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -4,6 +4,7 @@ Tor Browser Bundle (2.2.37-1); suite=linux * Switch Firefox to 10.0.5esr, since we will be tracking the extended stable releases for TBB stable versions * Update Vidalia to 0.2.19 + * Update Torbutton to 1.4.6 * Update NoScript to 2.4.4 -- Erinn Clark <erinn(a)torproject.org> Thu Jun 7 17:51:01 BRT 2012 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index c70d193..932ac47 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -4,6 +4,7 @@ Tor Browser Bundle (2.2.37-1); suite=osx * Switch Firefox to 10.0.5esr, since we will be tracking the extended stable releases for TBB stable versions * Update Vidalia to 0.2.19 + * Update Torbutton to 1.4.6 * Update NoScript to 2.4.4 -- Erinn Clark <erinn(a)torproject.org> Thu Jun 7 17:50:58 BRT 2012 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index c2fcd48..1c16910 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -4,6 +4,7 @@ Tor Browser Bundle (2.2.37-1); suite=windows * Switch Firefox to 10.0.5esr, since we will be tracking the extended stable releases for TBB stable versions * Update Vidalia to 0.2.19 + * Update Torbutton to 1.4.6 * Update NoScript to 2.4.4 -- Erinn Clark <erinn(a)torproject.org> Thu Jun 7 17:51:04 BRT 2012

1 0

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

07 Jun '12

commit ca4d7bcf8e5060a223b0a2229abce27afbb79a06 Merge: 248881b af0a838 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Jun 7 18:01:02 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 changelog.linux-2.2 | 1 + changelog.osx-2.2 | 1 + changelog.windows-2.2 | 1 + 3 files changed, 3 insertions(+), 0 deletions(-)

1 0

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

07 Jun '12

commit ca4d7bcf8e5060a223b0a2229abce27afbb79a06 Merge: 248881b af0a838 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Jun 7 18:01:02 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 changelog.linux-2.2 | 1 + changelog.osx-2.2 | 1 + changelog.windows-2.2 | 1 + 3 files changed, 3 insertions(+), 0 deletions(-)

1 0

[torbrowser/master] add torbutton 1.4.6 to the changelog
by erinn＠torproject.org 07 Jun '12

07 Jun '12

commit af0a83800993bd69a7d7dd215a5a792704532ec3 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Jun 7 18:00:51 2012 -0300 add torbutton 1.4.6 to the changelog --- changelog.linux-2.2 | 1 + changelog.osx-2.2 | 1 + changelog.windows-2.2 | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index c4adaaf..c8db556 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -4,6 +4,7 @@ Tor Browser Bundle (2.2.37-1); suite=linux * Switch Firefox to 10.0.5esr, since we will be tracking the extended stable releases for TBB stable versions * Update Vidalia to 0.2.19 + * Update Torbutton to 1.4.6 * Update NoScript to 2.4.4 -- Erinn Clark <erinn(a)torproject.org> Thu Jun 7 17:51:01 BRT 2012 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index c70d193..932ac47 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -4,6 +4,7 @@ Tor Browser Bundle (2.2.37-1); suite=osx * Switch Firefox to 10.0.5esr, since we will be tracking the extended stable releases for TBB stable versions * Update Vidalia to 0.2.19 + * Update Torbutton to 1.4.6 * Update NoScript to 2.4.4 -- Erinn Clark <erinn(a)torproject.org> Thu Jun 7 17:50:58 BRT 2012 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index c2fcd48..1c16910 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -4,6 +4,7 @@ Tor Browser Bundle (2.2.37-1); suite=windows * Switch Firefox to 10.0.5esr, since we will be tracking the extended stable releases for TBB stable versions * Update Vidalia to 0.2.19 + * Update Torbutton to 1.4.6 * Update NoScript to 2.4.4 -- Erinn Clark <erinn(a)torproject.org> Thu Jun 7 17:51:04 BRT 2012

1 0