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

2012-11-20 Thread erinn
commit 4d3205d38fa13fa05354e17e2b134a0f8dedbac1 Merge: 1939421 2b4266a Author: Erinn Clark Date: Tue Nov 20 14:22:02 2012 + Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 |6 +++--- README.OSX-2.2 |6 +++--- README.WIN-2.2 |6 +++--- b

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

2012-11-16 Thread erinn
commit 80c4a430b93a90b8e4dc397cbba7e789d9f94335 Merge: b53024f 90a083f Author: Erinn Clark Date: Sat Nov 17 01:02:10 2012 + Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

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

2012-10-29 Thread erinn
commit b53024f0baa2de0260244db02608c2c7bdb89742 Merge: 8ab988a 80c9f3e Author: Erinn Clark Date: Mon Oct 29 22:58:18 2012 + Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 18 +- 1 files changed, 9 insertions(+), 9 deletions(-) _

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

2012-10-27 Thread erinn
commit 0982a5210a22afc4ea26747aac86a61ba1c9951d Merge: 0179e89 c6ecaa9 Author: Erinn Clark Date: Sat Oct 27 12:03:20 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 |4 ++-- README.OSX-2.2|4 ++-- README.WIN-2.2|4 ++-- buil

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

2012-10-25 Thread erinn
commit 157fe34aa28e4c66dbdae5a9f1750241db6836c3 Merge: 06557b2 fe52948 Author: Erinn Clark Date: Thu Oct 25 11:19:46 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

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

2012-10-24 Thread erinn
commit 41056c205ca5628ad746570c6b23bec4f4533fe7 Merge: 9d2b5c6 09ea4a7 Author: Erinn Clark Date: Wed Oct 24 16:34:16 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 18 +- 1 files changed, 9 insertions(+), 9 deletions(-) ___

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

2012-10-24 Thread erinn
commit 9d2b5c639160349d6aa02cc28c7df58fcf1bcd16 Merge: 8ff89c0 f550eda Author: Erinn Clark Date: Wed Oct 24 16:33:09 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/prefs.js |1 + 1 files changed, 1 insertions(+), 0 deletions(-)

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

2012-10-18 Thread erinn
commit aa51199d160b836dbb46a2af705806074d498033 Merge: 8b21ddd 279edcd Author: Erinn Clark Date: Thu Oct 18 08:42:28 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 |4 ++-- README.OSX-2.2|4 ++-- README.WIN-2.2|4 ++-- buil

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

2012-10-16 Thread erinn
commit 119fa1e679e2a9d69d16c97fa5ed6c3caeb11076 Merge: 316df4e d5b4b06 Author: Erinn Clark Date: Tue Oct 16 11:22:31 2012 +0100 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] Merge branch 'maint-2.2' into maint-2.3

2012-10-13 Thread erinn
commit 55d73defda11bf1496e50565dd8ee911cb0530bb Merge: 27f13b3 5b6d240 Author: Erinn Clark Date: Sat Oct 13 10:20:42 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 |2 +- README.OSX-2.2 |2 +- README.WIN-2.2 |2 +- build-scripts

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

2012-10-12 Thread erinn
commit 27f13b373d35e142b21fca27a8d96d5b5133d95c Merge: b910e7f cb980b0 Author: Erinn Clark Date: Fri Oct 12 11:33:13 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) __

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

2012-10-11 Thread erinn
commit b910e7fcee7ac175ce1cc2a2a9e627850862ee91 Merge: 70291a7 86fba5c Author: Erinn Clark Date: Thu Oct 11 13:11:41 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 |2 +- README.OSX-2.2|2 +- README.WIN-2.2|2 +- build-scri

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

2012-10-11 Thread erinn
commit 70291a76b5bc7c18fc54d5a84c5f16a9001a877e Merge: 1153944 67671f3 Author: Erinn Clark Date: Thu Oct 11 11:13:01 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 |2 +- README.OSX-2.2|2 +- README.WIN-2.2|2 +- build-scri

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

2012-10-09 Thread mikeperry
commit 115394478d1bf987b8b7a9ac43d321eb8951e669 Merge: 9a21a47 1720f15 Author: Mike Perry Date: Tue Oct 9 15:12:30 2012 -0700 Merge branch 'maint-2.2' into maint-2.3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torp

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

2012-10-08 Thread erinn
commit 9a21a471e728b411f0fda7e8522a76204f9cda8d Merge: 6f2a09b ddb8796 Author: Erinn Clark Date: Mon Oct 8 10:03:19 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 |8 README.OSX-2.2 |8 README.WIN-2.2 |8 --

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

2012-10-07 Thread erinn
commit 6f2a09b585034c93419e192b6418518eeb68dea8 Merge: 31f5977 8831b1a Author: Erinn Clark Date: Mon Oct 8 07:42:10 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk | 10 +- ...d-mozIThirdPartyUtil.getFirstPartyURI-API.patch | 148 ++

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

2012-09-14 Thread erinn
commit 19d3c1fbf8650887e99b6b5cbceb9365dafb8571 Merge: b954810 f9cf082 Author: Erinn Clark Date: Fri Sep 14 21:27:14 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 18 +- 1 files changed, 9 insertions(+), 9 deletions(-) _

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

2012-09-11 Thread erinn
commit 203a451f17a30303e862759fa972dbd513066ec1 Merge: b079c16 3106539 Author: Erinn Clark Date: Tue Sep 11 19:12:02 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 |4 ++-- README.OSX-2.2|4 ++-- README.WIN-2.2|4 ++-- buil

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

2012-08-29 Thread erinn
commit fd39bf05cc4c75ec2684dbc560c37ec42afaac62 Merge: 2c46dfe 79c2018 Author: Erinn Clark Date: Wed Aug 29 19:08:11 2012 +0100 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] Merge branch 'maint-2.2' into maint-2.3

2012-08-26 Thread erinn
commit f764ddd2ceb8dc99a10afb27eeec65dd7a2bab91 Merge: 18d1057 b88ec22 Author: Erinn Clark Date: Mon Aug 27 07:29:04 2012 +0100 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-08-26 Thread erinn
commit 18d1057df5a2e539d9d48552da3cad4962b5959e Merge: 0aafb37 2c75280 Author: Erinn Clark Date: Mon Aug 27 07:13:55 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 |8 README.OSX-2.2|8 README.WIN-2.2|8 ++

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

2012-08-26 Thread erinn
commit 0aafb37aa7ba9f597981181793d67696b3668d3b Merge: 5b02117 5239f44 Author: Erinn Clark Date: Sun Aug 26 10:08:06 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

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

2012-08-17 Thread erinn
commit 5b0211745b145233634f91537ceb41472854f687 Merge: 4d1bbc9 e297669 Author: Erinn Clark Date: Fri Aug 17 22:09:38 2012 +0100 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] Merge branch 'maint-2.2' into maint-2.3

2012-08-13 Thread erinn
commit 4d1bbc978911e5abaf071cdb177f946ba530104c Merge: b9eca1c cc4a6f9 Author: Erinn Clark Date: Mon Aug 13 23:09:26 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/osx.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _

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

2012-08-13 Thread erinn
commit b9eca1c3ea873a888f5e1b86b704617bc5b87af3 Merge: 98ab7bf e2b3a8f Author: Erinn Clark Date: Mon Aug 13 23:02:05 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 |6 +++--- README.OSX-2.2|6 +++--- README.WIN-2.2|6 +++---

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

2012-08-12 Thread erinn
commit 98ab7bfc3bc97c1167e7178f7b7eaf311fd57c1a Merge: 1d65c88 8f065c8 Author: Erinn Clark Date: Sun Aug 12 22:20:15 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions |8 1 files changed, 4 insertions(+), 4 deletions(-) _

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

2012-07-31 Thread mikeperry
commit fe62dabc72f98e748dcbbb6ea06cb15dab2b4645 Merge: 266dd0d 899369e Author: Mike Perry Date: Tue Jul 31 18:17:35 2012 -0700 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/prefs.js |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ___

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

2012-07-31 Thread mikeperry
commit 266dd0d28bbfe6ddc1281f031132825583638168 Merge: 0087524 fb8c3ea Author: Mike Perry Date: Tue Jul 31 18:01:09 2012 -0700 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/prefs.js |1 + 1 files changed, 1 insertions(+), 0 deletions(-) _

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

2012-07-29 Thread erinn
commit 1f74fb9dc8d986956d154dcaae2efcdee9a769c3 Merge: 77b5803 6026825 Author: Erinn Clark Date: Mon Jul 30 00:50:35 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 18 +- 1 files changed, 9 insertions(+), 9 deletions(-) _

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

2012-07-20 Thread erinn
commit ed7f332c4dc8f083b61f4834217bfbfe0e5396c2 Merge: 97b8d22 e46b9c9 Author: Erinn Clark Date: Fri Jul 20 15:11:49 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 |6 +++--- README.OSX-2.2|6 +++--- README.WIN-2.2|6 +++---

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

2012-07-15 Thread erinn
commit 624905f44243968f87c775a135a64f46dfa4eaf2 Merge: d19d2d6 752e9ea Author: Erinn Clark Date: Sun Jul 15 22:05:36 2012 +0200 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk|2 +- build-scripts/osx.mk |2 +- build-scripts/versions.mk |6 +++--- build-

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

2012-07-06 Thread erinn
commit 349f942f6fd4eafaefa5c28c3d8563126214317a Merge: f4fae2b a17203c Author: Erinn Clark Date: Fri Jul 6 15:09:44 2012 +0200 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/dot_mozconfig |1 + 1 files changed, 1 insertions(+), 0 deletions(-) ___

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

2012-07-06 Thread erinn
commit f4fae2b474aacc7d5eeb940ea37072fe4b44c3e8 Merge: 75d8523 57fd7ad Author: Erinn Clark Date: Fri Jul 6 15:07:44 2012 +0200 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ___

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

2012-06-12 Thread erinn
commit 2c7028b792228c0b999b63f15eba58050a0df779 Merge: a8043f0 6948e41 Author: Erinn Clark Date: Tue Jun 12 18:15:17 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 15 +-- 1 files changed, 5 insertions(+), 10 deletions(-) ___

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

2012-06-12 Thread erinn
commit a8043f0b9c767675e906f324fc3b9c34fbbedc33 Merge: 0fdea13 b9f4cc4 Author: Erinn Clark Date: Tue Jun 12 15:34:53 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk |8 ++-- 1 files changed, 6 insertions(+), 2 deletions(-) ___

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

2012-06-12 Thread erinn
commit 0fdea13a3edb93509857fd41cb1f3727210432f1 Merge: c7a53ba 1ee67f4 Author: Erinn Clark Date: Tue Jun 12 15:30:33 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 src/current-patches/mozilla-build/start-msvc.patch |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _

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

2012-06-09 Thread erinn
commit c7a53ba99d593969b89546123b62e862ea43a6e7 Merge: 3fba40e 55976ea Author: Erinn Clark Date: Sat Jun 9 05:26:37 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk |2 +- build-scripts/osx.mk |2 +- build-scripts/windows.mk |2 +- 3 files change

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

2012-06-09 Thread erinn
commit 3fba40eb76f9b288d51f19eb00c69ad7fe7a3667 Merge: bf31618 7adcbe9 Author: Erinn Clark Date: Sat Jun 9 05:12:13 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk |2 +- ...Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch | 532 ++

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

2012-06-07 Thread erinn
commit bf31618d8680a0e780a448324cdafcb420365a7f Merge: ca4d7bc 43f99f2 Author: Erinn Clark 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(-) _

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

2012-06-07 Thread erinn
commit ca4d7bcf8e5060a223b0a2229abce27afbb79a06 Merge: 248881b af0a838 Author: Erinn Clark 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 inserti

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

2012-06-07 Thread erinn
commit 248881b6f1cbb801fdd54b1d702d1693d405fc04 Merge: bd99923 de216a9 Author: Erinn Clark Date: Thu Jun 7 17:58:33 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk |9 - build-scripts/osx.mk |2 +- changelog.linux-2.2| 12 +++- cha

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

2012-06-06 Thread erinn
commit bd9992349beca70bcded8b60c63bbc211741f049 Merge: 203c742 ef26306 Author: Erinn Clark Date: Wed Jun 6 22:02:52 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/vidalia.conf.ff-osx | 14 +++--- build-scripts/osx.mk |5 - bui

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

2012-06-06 Thread erinn
commit 203c7427a203db62ec8db7787e8468e7322065db Merge: 127a3cd 44f116b Author: Erinn Clark Date: Wed Jun 6 19:44:48 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk |7 +-- 1 files changed, 5 insertions(+), 2 deletions(-) _

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

2012-06-06 Thread erinn
commit 127a3cd2bdf9131048238d0c5526fdf74b2b8ffa Merge: fe48788 07dc532 Author: Erinn Clark Date: Wed Jun 6 18:31:35 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) _

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

2012-06-06 Thread erinn
commit fe48788c30de59f30125443f92655d54874bed56 Merge: 25e0792 db595ac Author: Erinn Clark Date: Wed Jun 6 17:21:06 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 | 10 +- README.OSX-2.2| 10 +- README.WIN-2.2| 10

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

2012-06-06 Thread erinn
commit 25e07929207ef34dcafa2752987bf53eefb37bf9 Merge: 4f99b60 c664f36 Author: Erinn Clark Date: Wed Jun 6 16:56:59 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/vidalia.conf.ff | 12 +- build-scripts/config/vidalia.conf.ff+pidgin| 12 +-

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

2012-06-05 Thread erinn
commit 4f99b60629bd66a0b4ac8352ca6aab2a63a1229c Merge: 722cec3 fb9824f Author: Erinn Clark Date: Tue Jun 5 15:55:10 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/dot_mozconfig |1 + build-scripts/linux.mk |7 ++- build-scripts/windows.mk

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

2012-06-04 Thread erinn
commit 722cec35254511047fdc2e4bcb5f094446c6bd47 Merge: 6ae1b78 22c0f8e Author: Erinn Clark Date: Tue Jun 5 01:09:05 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions |5 + 1 files changed, 5 insertions(+), 0 deletions(-) ___

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

2012-05-28 Thread erinn
commit 6ae1b78e59381b532cc1b60e940bd4df1a7ef1b8 Merge: f8897bb 894634d Author: Erinn Clark Date: Mon May 28 15:53:44 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 |6 +++--- README.OSX-2.2|6 +++--- README.WIN-2.2|6 +++---

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

2012-05-28 Thread erinn
commit f8897bbdeeeba6d7d93baf53960d4a09bf26b728 Merge: 18952b7 4e405e9 Author: Erinn Clark Date: Mon May 28 15:40:16 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/windows.mk |5 + src/current-patches/mozilla-build/start-msvc.patch | 1

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

2012-05-25 Thread mikeperry
commit 18952b7ec9c25f812f46cfbf8100026301ea366e Merge: c038e2c 9d4a8b4 Author: Mike Perry Date: Fri May 25 13:32:49 2012 -0700 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/prefs.js | 14 ++ 1 files changed, 10 insertions(+), 4 deletions(-) __

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

2012-05-25 Thread sebastian
commit c038e2c7170e3725ca0b83f08744d94947ee1718 Merge: b7492fc 4c3d7ca Author: Sebastian Hahn Date: Fri May 25 14:20:28 2012 +0200 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions |1 - 1 files changed, 0 insertions(+), 1 deletions(-) ___

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

2012-05-25 Thread sebastian
commit b7492fcf47a4cd4848f71552c768bb30eedef403 Merge: c0f17c1 7aeb874 Author: Sebastian Hahn Date: Fri May 25 14:10:13 2012 +0200 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions |1 + src/current-patches/mozilla-build/start-msvc.patch |2

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

2012-05-22 Thread erinn
commit c0f17c17116b13cc5f255a2fd8859b4f0d89186c Merge: 241327b 2282d5a Author: Erinn Clark Date: Tue May 22 23:50:02 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/windows.mk |2 +- changelog.windows-2.2|6 ++ 2 files changed, 7 insertions(+), 1 deletions

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

2012-05-22 Thread erinn
commit 241327b8539cf2b75ae02d5dad1bd04a4423b8a1 Merge: 53fb950 e5c15ee Author: Erinn Clark Date: Tue May 22 21:03:59 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/windows.mk |5 - src/current-patches/mozilla-build/start-msvc.patch |

[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/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] 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-11 Thread erinn
commit 14fe42ac63634ae7ed2358b6d6e751974d6c6fa6 Merge: d849559 d3b0d1b Author: Erinn Clark Date: Fri May 11 21:03:01 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 |4 ++-- README.OSX-2.2|4 ++-- README.WIN-2.2|4 ++-- buil

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

2012-05-11 Thread erinn
commit d849559d2527cd4e1f9608673f351c9e9ae0a4ee Merge: fe9c514 3dff6ac Author: Erinn Clark Date: Fri May 11 20:09:48 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/windows.mk |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) _

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

2012-05-11 Thread erinn
commit fe9c51463e759d8f7b9e05a2dc527db9d3da7984 Merge: 0caa05d 9c82539 Author: Erinn Clark Date: Fri May 11 16:12:17 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) __

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

2012-05-11 Thread erinn
commit 0caa05d8ae7a4d1943d2bba37d4bc489851c0ecd Merge: daad02b 8ce8d71 Author: Erinn Clark Date: Fri May 11 16:11:31 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk | 12 ++-- 1 files changed, 6 insertions(+), 6 deletions(-) __

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

2012-05-11 Thread erinn
commit daad02b97c1c6b783919294aa41835ee9af65aac Merge: 7726228 18dd7c3 Author: Erinn Clark Date: Fri May 11 10:51:11 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) __

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

2012-05-04 Thread erinn
commit 77262289bf4838ac8464724dc3a96c7c63dfc5ac Merge: 6cabf03 bd399fe Author: Erinn Clark Date: Fri May 4 18:59:53 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/windows.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

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

2012-05-04 Thread erinn
commit 6cabf03b3039040554bba11de5b96f733be8bcda Merge: b3787e1 f4a85c4 Author: Erinn Clark Date: Fri May 4 18:58:31 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ___

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

2012-05-04 Thread erinn
commit b3787e1232593242d89d7e62357a73fb052fa20c Merge: dccbcc1 dd611d8 Author: Erinn Clark 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(-) __

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

2012-05-03 Thread erinn
commit dccbcc1314412c85efcb93a4b72e5174435deaa0 Merge: 61758f7 2a7b8a5 Author: Erinn Clark 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(-) _

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

2012-05-03 Thread erinn
commit 61758f76cfaddb16cf24279ca9d033fddaa1399c Merge: c0abd9a 13f0261 Author: Erinn Clark Date: Thu May 3 09:29:03 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk |2 +- build-scripts/osx.mk |2 +- build-scripts/windows.mk |2 +- changelog.linu

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

2012-05-03 Thread erinn
commit c0abd9af5a58992509d4e1116a1dd61a8f55b52b Merge: 4f3bd9f 852f167 Author: Erinn Clark Date: Thu May 3 08:18:56 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/mozconfig-osx-i386 |4 ++-- build-scripts/config/mozconfig-osx-x86_64 |4 ++-- 2 files chan

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

2012-05-03 Thread erinn
commit 4f3bd9f3d2a2a775f29a1a14a830faa73f216d92 Merge: 21d3ebc b4ced8a Author: Erinn Clark Date: Thu May 3 07:53:25 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/prefs.js |4 build-scripts/install-mozbuild.bat |4 build-scripts/linux.mk

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

2012-05-01 Thread mikeperry
commit ea18a10cb2e12a976a892dca9379d3b62b2b11fc Merge: 9dcbd24 b158a60 Author: Mike Perry Date: Tue May 1 15:47:56 2012 -0700 Merge branch 'maint-2.2' into maint-2.3 ...-nsICacheService.EvictEntries-synchronous.patch | 44 1 files changed, 44 insertions(+), 0 deleti

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

2012-04-30 Thread erinn
commit 9dcbd241d97dcbf0024acdab5391840bbd04e7a8 Merge: 5a0466d 9c8e987 Author: Erinn Clark Date: Tue May 1 00:07:40 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

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

2012-04-30 Thread erinn
commit 5a0466da37ea5773a7605ff6440bf0f789fd4ee7 Merge: 6520144 31434ae Author: Erinn Clark Date: Mon Apr 30 17:51:37 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/osx.mk |2 +- changelog.osx-2.2|7 +++ 2 files changed, 8 insertions(+), 1 deletions(-) __

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

2012-04-30 Thread erinn
commit 65201446b38f4aa5e0a40d1ff86c67ad0bed Merge: 6e9b75b 1b56e94 Author: Erinn Clark Date: Mon Apr 30 15:19:37 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/mozconfig-osx-i386 |7 +-- build-scripts/config/mozconfig-osx-x86_64 |9 ++--- 2 f

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

2012-04-29 Thread erinn
commit 6e9b75b9eba85cce483183a44c86326a3287a2cc Merge: 75b70e9 f58f378 Author: Erinn Clark Date: Sun Apr 29 11:16:47 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _

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

2012-04-28 Thread erinn
commit 75b70e97299d6997a7bbf47f38fbe77a32bba197 Merge: 015742f a353d7d Author: Erinn Clark Date: Sat Apr 28 18:18:54 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/osx.mk |4 ++-- build-scripts/versions.mk |2 +- changelog.osx-2.2 |7 +++ 3 f

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

2012-04-28 Thread erinn
commit 015742f6fd8fa0144be748adbfbc532591a4dfdc Merge: 0c4d7fc 4c8d568 Author: Erinn Clark Date: Sat Apr 28 10:51:36 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 18 +- 1 files changed, 9 insertions(+), 9 deletions(-) _

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

2012-04-27 Thread erinn
commit 0c4d7fc9d5dcb3d2e5c7053b4e4b0d8098a4f4e4 Merge: d4b7a1f 7945762 Author: Erinn Clark Date: Fri Apr 27 13:34:56 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 | 10 +- README.OSX-2.2| 10 +- README.WIN-2.2| 1

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

2012-04-27 Thread erinn
commit d4b7a1f7f238be0b56729ba062b6861b81196f05 Merge: 1344c9c 2585807 Author: Erinn Clark Date: Fri Apr 27 12:09:18 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 ...ize-HTTP-request-order-and-pipeline-depth.patch |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _

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

2012-04-27 Thread erinn
commit 1344c9c6e824c19de3bf9fb1949aac615559a152 Merge: bb64a64 4a4879a Author: Erinn Clark Date: Fri Apr 27 10:50:05 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 ...ize-HTTP-request-order-and-pipeline-depth.patch | 21 ++- 1 files changed, 19 insertions(+), 2 delet

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

2012-04-27 Thread erinn
commit bb64a64a4801bbb4fcb78bf8c76d7f0ddb41b390 Merge: 404a66e 48bbd95 Author: Erinn Clark Date: Fri Apr 27 10:09:00 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk |2 +- build-scripts/osx.mk | 18 +

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

2012-04-27 Thread erinn
commit 404a66ec9398082358fea393a2aba91ec894e3d9 Merge: 83fa4cc 86113b9 Author: Erinn Clark Date: Fri Apr 27 07:24:26 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk|2 +- build-scripts/osx.mk |2 +- build-scripts/versions.mk |2 +- build-scri

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

2012-04-26 Thread erinn
commit 83fa4cc44516429abfe8bda23201a9fb3c7e0e2d Merge: a91b9e0 1096251 Author: Erinn Clark Date: Thu Apr 26 23:03:14 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 .../0015-Add-DDG-and-StartPage-to-Omnibox.patch| 84 +++ .../0015-Undo-some-Mozilla-braindamage.patch | 28

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

2012-04-26 Thread erinn
commit a91b9e0d46756381e8992e6cdccfa3b442c665ad Merge: 2f4e9b5 b38e2b0 Author: Erinn Clark Date: Thu Apr 26 19:18:58 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/mozconfig-osx-x86_64 |9 + 1 files changed, 5 insertions(+), 4 deletions(-) ___

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

2012-04-26 Thread erinn
commit 2f4e9b59d6bfb36cdc6ca108b9b210c37dd0a67f Merge: 92f6355 a364852 Author: Erinn Clark Date: Thu Apr 26 13:50:26 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/osx.mk |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) _

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

2012-04-26 Thread erinn
commit 92f635537c9c95174346d2552b5f81e6a2151199 Merge: f81c8eb 77ba44e Author: Erinn Clark Date: Thu Apr 26 10:04:55 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk |5 build-scripts/osx.mk |9

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

2012-04-26 Thread erinn
commit f81c8eb936e2a555488ed6f9a9bfd5365dc96925 Merge: 6648eaf c518a3e Author: Erinn Clark Date: Thu Apr 26 08:37:07 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 .../App/DefaultData/profile/prefs.js | 174 --- .../config/firefox-portable/Data/profile/p

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

2012-04-25 Thread erinn
commit 6648eafc126d163173dc8b7b204046611f085d36 Merge: b8574c2 f2d9940 Author: Erinn Clark Date: Wed Apr 25 21:01:34 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 .../openssl/0002-Fix-openssl-1.0.1a-compile.patch | 26 1 files changed, 26 insertions(+), 0 dele

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

2012-04-25 Thread erinn
commit c6d006f071f7a8dcd716365804ca416d6813f3e6 Merge: 7acecea ab05ecd Author: Erinn Clark Date: Wed Apr 25 13:42:44 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk |2 +- build-scripts/osx.mk |2 +- build-scripts/windows.mk |2 +- 3 files chang

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

2012-04-25 Thread erinn
commit b8574c221a6454f7e9cd0082155c09d55c2c200a Merge: c6d006f e6f9b2d Author: Erinn Clark Date: Wed Apr 25 13:43:17 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) __

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

2012-04-25 Thread erinn
commit 7acecea502d3ff2e2e63639d7050140da0031032 Merge: f8630e8 e3e2457 Author: Erinn Clark Date: Wed Apr 25 09:34:59 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/branding/about.png | Bin 20908 -> 0 bytes build-scripts/branding/background.png

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

2012-04-24 Thread mikeperry
commit f8630e8ce0a5396f889b849819c31906161a4007 Merge: a7d1ca2 4128643 Author: Mike Perry Date: Tue Apr 24 17:29:53 2012 -0700 Merge branch 'maint-2.2' into maint-2.3 ...nents.interfaces-lookupMethod-from-conten.patch | 10 +- ...0002-Make-Permissions-Manager-memory-only.patch |8 +-

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

2012-04-23 Thread erinn
commit a7d1ca21fba87b8f3d1091e803972899531294bd Merge: 3cd7c2c 300c2ef Author: Erinn Clark Date: Mon Apr 23 14:20:32 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/mozconfig-osx-i386| 11 ++-- build-scripts/linux.mk |2

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

2012-04-04 Thread erinn
commit 7caba4b27e9645e7da39379b16ecce8a643540cf Merge: edd91f5 aaed240 Author: Erinn Clark Date: Wed Apr 4 17:01:28 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk |7 --- build-scripts/osx.mk |6 -- build-scripts/windows.mk |6 -- 3

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

2012-04-03 Thread erinn
commit edd91f582be790812320ab441097a44dad572585 Merge: 38a0675 24ed18b Author: Erinn Clark Date: Tue Apr 3 19:00:07 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 src/RelativeLink/RelativeLinkOSX.sh |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _

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

2012-03-19 Thread erinn
commit 38a0675ba1225cebe9274d7d2faf881209d6ac4a Merge: bb7ecfb 7a82857 Author: Erinn Clark Date: Mon Mar 19 14:31:26 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) _

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

2012-03-18 Thread erinn
commit 3f22b939ca27e1e9ac38563a79d20d2d403f4021 Merge: cb165cf c94869d Author: Erinn Clark Date: Mon Mar 19 01:11:43 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk |2 +- changelog.linux-2.2 |7 +++ src/RelativeLink/RelativeLin

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

2012-03-18 Thread erinn
commit cb165cfa4968e9d07cd72c2b9192f1963b481fac Merge: 708d300 7aceb88 Author: Erinn Clark Date: Sun Mar 18 12:53:39 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions |8 1 files changed, 4 insertions(+), 4 deletions(-) ___

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

2012-03-16 Thread erinn
commit 708d30060df5041ff43d850fd9aa71117e5796a1 Merge: 848b923 60770df Author: Erinn Clark Date: Fri Mar 16 18:31:23 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 |8 README.OSX-2.2|8 README.WIN-

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

2012-03-16 Thread erinn
commit 941bac0dd253017fc80d724039f239135dabde1e Merge: 877c8de ada85fd Author: Erinn Clark Date: Fri Mar 16 15:33:19 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/osx.mk |1 - build-scripts/windows.mk |5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-

  1   2   >