commit 647c052e70026b116e51dfd16441f2b471e66776 Merge: fc74ecf d1b31fc Author: Mike Perry mikeperry-git@torproject.org Date: Thu May 29 11:57:38 2014 -0700
Merge remote-tracking branch 'brade/bug11641-rebase1'
.../PTConfigs/linux/torrc-defaults-appendix | 6 +- .../PTConfigs/windows/torrc-defaults-appendix | 6 +- Bundle-Data/mac/Contents/Info.plist | 44 ------ Bundle-Data/mac/Contents/PkgInfo | 1 - Bundle-Data/mac/Contents/Resources/firefox.icns | Bin 242224 -> 0 bytes .../Data/Browser/profile.default/bookmarks.html | 17 -- .../preferences/extension-overrides.js | 58 ------- Bundle-Data/mac/Data/Browser/profiles.ini | 9 -- Bundle-Data/mac/Data/Tor/torrc-defaults | 10 -- .../Data/Browser/profile.default/bookmarks.html | 17 ++ .../preferences/extension-overrides.js | 58 +++++++ .../mac/TorBrowser/Data/Browser/profiles.ini | 9 ++ Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults | 10 ++ RelativeLink/Makefile | 26 ---- RelativeLink/RelativeLink-res.rc | 1 - RelativeLink/RelativeLink.c | 162 -------------------- RelativeLink/RelativeLink.ico | Bin 23934 -> 0 bytes RelativeLink/RelativeLink.sh | 8 +- RelativeLink/RelativeLinkOSX.sh | 64 -------- gitian/build-helpers/fix-info-plist.sh | 33 ++++ gitian/descriptors/linux/gitian-bundle.yml | 28 ++-- gitian/descriptors/mac/gitian-bundle.yml | 42 +++-- gitian/descriptors/mac/gitian-firefox.yml | 11 +- .../mac/gitian-pluggable-transports.yml | 25 +-- gitian/descriptors/mac/gitian-tor.yml | 15 +- gitian/descriptors/windows/gitian-bundle.yml | 35 ++--- gitian/fetch-inputs.sh | 6 +- gitian/mkbundle-mac.sh | 6 +- gitian/mkbundle-windows.sh | 6 +- gitian/versions | 10 +- 30 files changed, 226 insertions(+), 497 deletions(-)