commit 5cc51cbe149918b700e4d8aa4f0d95772fe1357e Merge: 33a8fe2 ff81391 Author: Erinn Clark erinn@torproject.org Date: Thu Mar 8 17:25:40 2012 -0300
Merge branch 'maint-2.2' into maint-2.3
README.dev | 35 - build-scripts/DEPLOYMENT | 9 +- build-scripts/INSTALL | 89 +-- build-scripts/config/dot_mozconfig | 1 + .../App/DefaultData/profile/bookmarks.html | 17 - .../firefox-portable/Data/profile/bookmarks.html | 24 - build-scripts/config/linux-prefs.js | 157 -- build-scripts/config/no-polipo.js | 178 --- build-scripts/config/polipo-Makefile | 144 -- build-scripts/config/polipo.conf | 161 --- build-scripts/config/prefs.js | 176 --- build-scripts/config/vidalia.conf.ff+pidgin | 2 - build-scripts/config/vidalia.conf.ff+pidgin-linux | 2 - build-scripts/config/windows-4.0.js | 14 +- build-scripts/configure-firefox.sh | 39 - build-scripts/linux.mk | 192 +-- build-scripts/osx.mk | 208 +-- build-scripts/patch-any-src.sh | 2 +- build-scripts/patch-firefox-language.sh | 2 - build-scripts/patch-mozilla-build.sh | 2 +- build-scripts/patch-pidgin-language.sh | 2 - build-scripts/patch-vidalia-language.sh | 2 - build-scripts/pyget.py | 67 - build-scripts/versions.mk | 238 +++- build-scripts/windows.mk | 211 +-- docs/ToaST-startup.txt | 90 -- docs/rationale.txt | 56 - docs/torusb-notes.txt | 82 -- docs/traces.txt | 4 +- docs/two-firefox.txt | 72 - src/FindTraces/dumpreg.py | 2 - src/FindTraces/registrydict.py | 1 - src/RelativeLink/RelativeLink.sh | 5 +- src/RelativeLink/RelativeLinkOSX.sh | 2 +- .../0001-Firefox4-Fix-SOCKS-timeout.patch | 1500 -------------------- ...ock-Components.interfaces-lookupMethod-fr.patch | 50 - ...ock-Components.interfaces-lookupMethod-fr.patch | 50 - ...-Make-Intermediate-Cert-Store-memory-only.patch | 300 ---- ...-Make-Intermediate-Cert-Store-memory-only.patch | 283 ---- ...fox5-Make-Permissions-Manager-memory-only.patch | 94 -- ...fox4-Make-Permissions-Manager-memory-only.patch | 94 -- src/archived-patches/0005-Smash-the-state.patch | 37 - src/archived-patches/vidalia-altlauncher.patch | 185 --- src/archived-patches/vidalia-miniupnp.patch | 185 --- src/archived-patches/vidalia-startbrowser.patch | 254 ---- src/archived-patches/vidalia-startim.patch | 257 ---- src/archived-patches/vidalia-startproxy.patch | 429 ------ .../vidalia-startproxyarguments.patch | 69 - src/current-patches/mozilla-build/start-msvc.patch | 2 +- src/current-patches/qt/qt-interlock-fix.patch | 36 - .../vidalia/vidalia-killbrowser.patch | 22 - src/osx-sandboxes/polipo-sandbox/polipo-10.5.sb | 70 - src/osx-sandboxes/polipo-sandbox/polipo-wrapper | 70 - src/osx-sandboxes/polipo-sandbox/polipo.sb | 71 - src/processtest/GPL-v2.txt | 339 ----- src/processtest/README | 13 - src/processtest/browserprocess.cpp | 55 - src/processtest/browserprocess.h | 54 - src/processtest/main.cpp | 53 - src/processtest/processtest.cpp | 104 -- src/processtest/processtest.h | 70 - src/processtest/processtest.pro | 14 - 62 files changed, 391 insertions(+), 6657 deletions(-)