[tor-commits] [torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3

2012-05-12 Thread erinn
commit 53fb950252095b014eb2a003e568a577d993b9f3 Merge: 06352bd 8e41d82 Author: Erinn Clark 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(-) _

[tor-commits] [torbrowser/master] update recommend-versions for 2.2.35-12

2012-05-12 Thread erinn
commit 8e41d820564a597f69f92050035b2ba7e350e16b Author: Erinn Clark 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/recommende

[tor-commits] [torbrowser/maint-2.2] update recommend-versions for 2.2.35-12

2012-05-12 Thread erinn
commit 8e41d820564a597f69f92050035b2ba7e350e16b Author: Erinn Clark 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/recommende

[tor-commits] [torbrowser/master] Merge branch 'maint-2.2' into maint-2.3

2012-05-12 Thread erinn
commit 53fb950252095b014eb2a003e568a577d993b9f3 Merge: 06352bd 8e41d82 Author: Erinn Clark 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(-) _

[tor-commits] [torbrowser/maint-2.3] update recommend-versions for 2.2.35-12

2012-05-12 Thread erinn
commit 8e41d820564a597f69f92050035b2ba7e350e16b Author: Erinn Clark 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/recommende

[tor-commits] r25648: {website} bump tbbs and vidalia bundles for new packages with openssl (website/trunk/include)

2012-05-12 Thread Erinn Clark
Author: erinn Date: 2012-05-13 00:08:43 + (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 ===

[tor-commits] [torbrowser/master] Merge branch 'maint-2.2' into maint-2.3

2012-05-12 Thread erinn
commit 06352bd7c7bf2bd240ca423d6c700606f6fc3e96 Merge: 85b9503 a90ae13 Author: Erinn Clark 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(-) _

[tor-commits] [torbrowser/master] update zlib library name in linux makefile

2012-05-12 Thread erinn
commit a90ae13ca9094aaa8527e7c78446f4c2580d0aab Author: Erinn Clark 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/li

[tor-commits] [torbrowser/maint-2.3] update zlib library name in linux makefile

2012-05-12 Thread erinn
commit a90ae13ca9094aaa8527e7c78446f4c2580d0aab Author: Erinn Clark 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/li

[tor-commits] [torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3

2012-05-12 Thread erinn
commit 06352bd7c7bf2bd240ca423d6c700606f6fc3e96 Merge: 85b9503 a90ae13 Author: Erinn Clark 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(-) _

[tor-commits] [torbrowser/maint-2.2] update zlib library name in linux makefile

2012-05-12 Thread erinn
commit a90ae13ca9094aaa8527e7c78446f4c2580d0aab Author: Erinn Clark 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/li

[tor-commits] [torbrowser/maint-2.3] update libevent library names in linux makefile

2012-05-12 Thread erinn
commit ad859b060ec77434eb9ea6d2733758f8aa84f73e Author: Erinn Clark Date: Sat May 12 10:41:41 2012 -0300 update libevent library names in linux makefile --- build-scripts/linux.mk |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux.mk b/build-s

[tor-commits] [torbrowser/master] update libevent library names in linux makefile

2012-05-12 Thread erinn
commit ad859b060ec77434eb9ea6d2733758f8aa84f73e Author: Erinn Clark Date: Sat May 12 10:41:41 2012 -0300 update libevent library names in linux makefile --- build-scripts/linux.mk |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux.mk b/build-s

[tor-commits] [torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3

2012-05-12 Thread erinn
commit 85b9503ab572248e76cfb1dab7fbb7f9931e65c3 Merge: 14fe42a ad859b0 Author: Erinn Clark Date: Sat May 12 10:42:04 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) _

[tor-commits] [torbrowser/master] Merge branch 'maint-2.2' into maint-2.3

2012-05-12 Thread erinn
commit 85b9503ab572248e76cfb1dab7fbb7f9931e65c3 Merge: 14fe42a ad859b0 Author: Erinn Clark Date: Sat May 12 10:42:04 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) _

[tor-commits] [torbrowser/maint-2.2] update libevent library names in linux makefile

2012-05-12 Thread erinn
commit ad859b060ec77434eb9ea6d2733758f8aa84f73e Author: Erinn Clark Date: Sat May 12 10:41:41 2012 -0300 update libevent library names in linux makefile --- build-scripts/linux.mk |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux.mk b/build-s