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 ef87887955eef730a7e6a712a0a4430fccd476d3 Merge: b090e92 98ab7bf Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 12 22:20:23 2012 +0100 Merge branch 'maint-2.3' build-scripts/recommended-versions | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)

1 0

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

07 Sep '12

commit d4864766a26d31edccccb960ab96a88c46b79cb0 Merge: a82e8fb 5691211 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 6 02:02:49 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 | 4 ++-- build-scripts/windows-alpha.mk | 2 +- changelog.linux-2.3 | 12 ++++++++++++ changelog.osx-2.3 | 11 +++++++++++ changelog.windows-2.3 | 11 +++++++++++ 9 files changed, 41 insertions(+), 7 deletions(-)

1 0

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

07 Sep '12

commit f9919a1ea588649b20b5d19c9c3f161aa158a9c1 Merge: ef87887 e2b3a8f Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 13 23:02:10 2012 +0100 Merge branch 'maint-2.2' README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 8 ++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 8 ++++++++ 10 files changed, 40 insertions(+), 16 deletions(-)

1 0

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

07 Sep '12

commit e2fac8a4921a1e0fe3ecff84a1ba159150a63d2e Merge: 0f92e65 5b02117 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Aug 17 22:09:43 2012 +0100 Merge branch 'maint-2.3' build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)

1 0

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

07 Sep '12

commit 0f92e656ff68514d21d01bb426b4e2b1ac83df88 Merge: f9919a1 4d1bbc9 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 13 23:09:31 2012 +0100 Merge branch 'maint-2.3' build-scripts/osx.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 a1b4049ea5858d923b6ee8f6c23f532f01e3b45d Merge: e2fac8a 0aafb37 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 26 10:08:12 2012 +0100 Merge branch 'maint-2.3' build-scripts/versions.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 31c0e3c93b2d8b003ab30bb90c69c2f01e97f29a Merge: a1b4049 18d1057 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 27 07:14:01 2012 +0100 Merge branch 'maint-2.3' README.LINUX-2.2 | 8 ++++---- README.OSX-2.2 | 8 ++++---- README.WIN-2.2 | 8 ++++---- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 6 +++--- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 9 +++++++++ changelog.osx-2.2 | 9 +++++++++ changelog.windows-2.2 | 9 +++++++++ 10 files changed, 45 insertions(+), 18 deletions(-)

1 0

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

07 Sep '12

commit 87a3b8262c2de9b494a9475347d8bbe8090e47a7 Merge: 3356ab5 2c46dfe Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 29 05:18:25 2012 +0100 Merge branch 'maint-2.3' build-scripts/versions-alpha.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)

1 0

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

07 Sep '12

commit 3356ab5dca3fc20981ad114e642a1bb61e535b92 Merge: 31c0e3c f764ddd Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 27 07:29:09 2012 +0100 Merge branch 'maint-2.3' build-scripts/linux.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

1 0

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

07 Sep '12

commit 4bbf121d16d4e1e4a06211db32d2cb02e2313c8f Merge: 0220d0a 196ebd2 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Sep 4 14:46:10 2012 +0100 Merge branch 'maint-2.3' build-scripts/osx-alpha.mk | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

1 0