- tor-commits - lists.torproject.org

r25183: {website} add the easy way to edit torrc, this covers tbb as well. (website/trunk/docs/en)
by Andrew Lewman 25 Oct '11

25 Oct '11

Author: phobos Date: 2011-10-25 17:44:31 +0000 (Tue, 25 Oct 2011) New Revision: 25183 Modified: website/trunk/docs/en/faq.wml Log: add the easy way to edit torrc, this covers tbb as well. Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2011-10-23 18:03:53 UTC (rev 25182) +++ website/trunk/docs/en/faq.wml 2011-10-25 17:44:31 UTC (rev 25183) @@ -974,11 +974,15 @@ make common changes through the Vidalia interface — only advanced users should need to modify their torrc file directly. - +The preferred way to edit your torrc is through Vidalia. Open the +Vidalia Control Panel. Choose Settings. Choose Advanced. Click the button +labelled "Edit current torrc". Remember to make sure the checkbox for +"Save Settings." is checked. Hit the Ok button and you are done. + + The location of your torrc file depends on the way you installed Tor: - <ul> <li>On Windows, if you installed a Tor bundle with Vidalia, you can find your torrc file in the Start menu under Programs -> Vidalia

1 0

[torbrowser/maint-2.2] remove unused files (old READMEs and Makefile)
by erinn＠torproject.org 25 Oct '11

25 Oct '11

commit 553e79eb93eca0ee49b656faf2e62af0641e93c2 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Oct 25 17:03:30 2011 +0100 remove unused files (old READMEs and Makefile) --- README | 319 -------------------------------------------- README.Linux | 126 ------------------ README.OSX | 73 ---------- build-scripts/Makefile | 346 ------------------------------------------------ 4 files changed, 0 insertions(+), 864 deletions(-) diff --git a/README b/README deleted file mode 100644 index f468921..0000000 --- a/README +++ /dev/null @@ -1,319 +0,0 @@ -Tor USB project -=============== - -Included applications ---------------------- - -Vidalia 0.2.10 (with Qt 4.6.2) -Tor 0.2.1.28 (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) -Polipo 1.0.4.1 -FirefoxPortable 3.6.13 - \_ Firefox 3.6.13 - \_ Torbutton 1.2.5 - \_ HTTPS Everywhere 0.9.9.development.2 -PidginPortable 2.7.4 - \_ Pidgin 2.7.5 - \_ OTR 3.2 - -Usage ------ - -Tor Browser.exe is a 7zip self extracting archive. To extract the bundle, run -this and point it to the install location. It will create a folder called "Tor -Browser". This may be the hard disk, but is more likely the currently mounted -USB drive. The install process needs only be performed once. - -Once the bundle is extracted, open the newly created folder and click -"Start Tor Browser.bat" (may appear as simply "Start Tor Browser"). -This will start Vidalia. Once Tor has successfully opened a circuit, -Firefox will automatically be opened. - -To exit, close Firefox. Vidalia will automatically clean up and exit. - -Changelog ---------- - -0.0.1: Initial revision (2007-12-11) -0.0.2: Update Vidalia to r2213 (2007-12-13) - Update Tor to 0.2.0.12-alpha - Add license files - Remove Portable Tor dependency - Add bookmarks to Tor, Torcheck and the hidden wiki -0.0.3: Move build infrastructure to GNU Make (2007-12-16) - Install Torbutton -0.0.4: Add internationalization for fa-IR and zh-CN - Add Makefile rule for installing Quick Locale Switcher, but - don't enable this by default -0.0.5: Disable FirefoxPortable splash screen (2007-12-24) - New prefs.js: - - Disable history storage - - Disable <a ping> handling - - Disable session storage (crash recovery) - - Disable logging of CSS errors - - Disable persistent cookies - - Disable IPv6 - - Disable external protocol handlers - - Disable failover to a secondary proxy - - Sanitize cookies and passwords on shutdown - - Prevent scripts calling plugins - - Empty add-on installation whitelist -0.0.6: Released 2008-01-29 - Rename start file "Start Tor Browser" so as to be easier to explain - Location of wget is now a configurable parameter - Vidalia updated to r2337 (for ProxyExecutable(Arguments) options - Tor updated to 0.2.0.18-alpha - Polipo 1.0.4 now included in bundle and Firefox configured - Firefox now configured to use proxies at 127.0.0.1 to prevent IPv6 attempt -0.0.7: Released 2008-02-08 - Security update of FirefoxPortable to v2.0.12 (see - http://www.mozilla.org/projects/security/known-vulnerabilities.html#Firefox) -0.0.8: Released 2008-02-15 - Security update of Torbutton to v1.1.13 (see - http://torbutton.torproject.org/dev/CHANGELOG) - Automate generation of internationalized bundles - Allow optional extensions to be placed in build-scripts/extensions - Build Polipo with regular expression support, activating forbiddenFile option - Update Polipo configuration based on Incognito suggestions -1.0.0: Released 2008-03-20 - Fix parse errors in polipo.conf (Phillip) - Move to HTTPS and specify language in homepage URL (check.torproject.org) - Update Vidalia license - Fix Makefile error when re-building the bundle - Update of Tor to 0.2.0.22-rc - Update of Torbutton to v1.1.17 (see - http://torbutton.torproject.org/dev/CHANGELOG) - Update of Vidalia to revision 2424 - Suppress warning on viewing an encrypted page -1.0.1: Released 2008-03-26 - Install .jar files placed in /extensions, as well as .xpi files - Update of Firefox to 2.0.0.13 to fix security problems (see - http://www.mozilla.org/projects/security/known-vulnerabilities.html#firefox…) - Update of Vidalia to revision 2464 - Update of Tor to 0.2.0.23-rc - Update prefs.js for new Torbutton defaults -1.0.2: Released 2008-05-03 - Update Vidalia to revision 2539 - Update Tor to 0.2.0.25-rc - Update FirefoxPortable to 2.0.0.14 - Update Torbutton to 1.1.18 - Add RunProxyAtStart to vidalia.conf (now required) -1.0.3: Released 2008-05-16 - Update Tor to 0.2.0.26-rc -1.1.0: Released 2008-06-13 - Replace startup batch script with application (RelativeLink), so there is a helpful icon - Make Qt 4.3.5 the default version - Optionally install Pidgin (for Tor IM Browser Bundle) - Extended INSTALL documentation - Optionally use WinRAR to produce a self-extracting split bundle - Update Vidalia to revision 2718 - Update Tor to 0.2.1.1-alpha - Update OpenSSL to 0.9.8h -1.1.1: Released 2008-07-20 - Update Vidalia to release 0.1.6 (we now longer need to track SVN trunk) - Update Pidgin Portable to 2.4.3 - Update Pidgin OTR plugin to 3.2 - Update Tor to 0.2.1.2-alpha - Update Torbutton to 1.2.0rc6 - Set TZ=UTC environment variable in RelativeLink (needed by Torbutton) -1.1.2: Released 2008-08-09 - Don't set TZ environment variable in RelativeLink (now done by Vidalia 0.1.7) - Update Vidalia to release 0.1.7 - Update Tor to 0.2.1.4-alpha - Update Firefox to 2.0.0.16 -1.1.3: Released 2008-08-22 - Fix homepage so that it is properly localized - Add &small=1 to homepage URL to request a more discreet page - Update Vidalia to release 0.1.8 -1.1.4: Released 2008-10-13 - Update Vidalia to release 0.1.9 - Update Tor to 0.2.1.6-alpha - Update Firefox to 2.0.0.16 - Update Pidgin to 2.5.1 -1.1.5: Released 2008-12-01 - Set AllowMultipleInstances=true, to allow Tor Browser Bundle and - Firefox to be run at the same time (suggested by John Brooks) - Update Vidalia to release 0.1.10 - Update Firefox to 2.0.0.18 - Update Tor to 0.2.1.7-alpha - Update Pidgin to 2.5.2 - Added a small patch and instructions to fix Qt compile time error - Corrected some minor mistakes in the INSTALL document - Updated INSTALL document to reflect updated build process -1.1.6: Released 2008-12-02 - Set AllowMultipleInstances=false, this isn't ready for primetime -1.1.7: Released 2008-12-12 - Update Tor to 0.2.1.8-alpha - Fix issue with OTR (The Pidgin wasn't in the right directory) - Update INSTALL document to reflect updated version numbers -1.1.8: Released 2009-01-22 - Update Tor to 0.2.1.11-alpha (security update) - Update OpenSSL to 0.9.8j (security update) - Update Firefox to 3.0.5 - Update Pidgin to 2.5.4 - Update libevent to 1.4.9 - -1.1.9: Released 2009-02-18 - Update Tor to 0.2.1.12-alpha - Update Firefox to 3.0.6 - Update Vidalia to 0.1.11 - -1.1.10: Released 2009-03-10 - Update Tor to 0.2.1.13-alpha - Update Firefox to 3.0.7 - Update Pidgin to 2.5.5 - -1.1.11: Released 2009-03-31 - Update Firefox to 3.0.8 - Add Italian language bundles - Update Torbutton to 1.2.1 - Update Vidalia to 0.1.12 - -1.1.12: Released 2009-04-12 - Update OpenSSL to 0.9.8k - Update Tor to 0.2.1.14-rc - -1.2.0: Released 2009-05-25 - Switch to launching Firefox directly from Vidalia to - allow multiple instances of Firefox - Update Firefox to 3.0.10 - Update to Qt 4.5.1 - Update Firefox prefs.js to stop scanning for plugins - Update libevent to 1.4.11 - Include the Tor geoip database - Update Vidalia to 0.1.13 - Update Tor to 0.2.1.15-rc - -1.2.1: Released 2009-06-21 - Better updates to Firefox to stop scanning for plugins on start - Update Pidgin to 2.5.6r2 - Update Firefox to 3.0.11 - Include OpenSSL 0.9.8k DLL and stop using the system ssl dll - Update Tor to 0.2.1.16-rc - -1.2.2: Released 2009-06-23 - Update Pidgin to 2.5.7 - -1.2.3: Released 2009-07-08 - Update Vidalia to 0.1.14 - Update Tor to 0.2.1.17-rc - Update Pidgin to 2.5.8 - -1.2.4: Released 2009-07-11 - Include libeay32.dll from OpenSSL 0.9.8k to make QT happy - Update Vidalia to 0.1.15 - -1.2.5: Released 2009-07-25 - update Tor to 0.2.1.18 - -1.2.6: Released 2009-07-28 - update Tor to 0.2.1.19 - -1.2.7: Released 2009-08-04 - update Firefox to 3.0.13 - add Polish translation - update libevent to 1.4.12 - -1.2.8: Released 2009-08-19 - update Torbutton to 1.2.2 - update Vidalia to 0.2.2 - compile OpenSSL 0.9.8k with Visual C to make dlls - update Pidgin to 2.6.1 - -1.2.9: Released 2009-09-11 - update Vidalia to 0.2.4 - update Qt to 4.5.2 - update Pidgin to 2.6.2 - update Firefox to 3.0.14 - -1.2.10: Released 2009-11-20 - update Vidalia to 0.2.6 - update Pidgin to 2.6.3 - update Tor to 0.2.1.20 - update Firefox to 3.0.15 - update OpenSSL to 0.9.8l - update libevent to 1.4.13 - -1.3.0: Released 2009-12:31 - upgrade Firefox to 3.5.6 - update Pidgin to 2.6.4 - update Torbutton to 1.2.4 - update Tor to 0.2.1.21 - -1.3.1: Released 2010-01-22 - update Firefox to 3.5.7 - update Pidgin to 2.6.5 - update Tor to 0.2.1.22 - -1.3.2: Released 2010-02-15 - update Vidalia to 0.2.7 - update Tor to 0.2.1.23 - update Qt to 4.6.2 - update Polipo to 1.4.0.1 - configure pidgin to not log chats by default - -1.3.3: Released 2010-02-27 - update Firefox to 3.5.8 - update Pidgin to 2.6.6 - update Tor to 0.2.1.24 - -1.3.4: Released 2010-04-04 - update Firefox to 3.5.9 - update Tor to 0.2.1.25 - -1.3.5: Released 2010-05-03 - add Vietnamese language - update Torbutton to 1.2.5 - update Tor to 0.2.1.26 - -1.3.6: Released 2010-05-26 - update Vidalia to 0.2.9 - -1.3.7: Released 2010-07-04 - update Pidgin to 2.7.1r2 - update Firefox to 3.5.10 - -1.3.8: Released 2010-07-22 - update Firefox to 3.5.11 - -1.3.9: Released 2010-07-22 - update Pidgin to 2.7.2 - -1.3.10: Released 2010-09-28 - update Vidalia to 0.2.10 - update Firefox to 3.6.10 - add new extensions: - Better Privacy 1.48.3 - NoScript 2.0.3.2 - HTTPS Everywhere 0.2.2 - -1.3.11: Released 2010-10-25 - update Firefox to 3.6.11 - update Pidgin to 2.7.4 - -1.3.12: Released 2010-10-28 - update Firefox to 3.6.12 - -1.3.13: Released 2010-11-25 - update Tor to 0.2.1.27 - update Pidgin to 2.7.5 - update OpenSSL to 0.9.8p - fix Firefox extension install path so extensions show in the installed add-ons list - disable Firefox's ability to search the Windows registry path for system-wide - plugins and extensions (closes: #2118) - remove NoScript and BetterPrivacy from stable bundle until they receive more - testing - -1.3.14: Released 2010-12-13 - update Firefox to 3.6.13 - update HTTPS-Everywhere to 0.9.9.development.1 - This version of HTTPS-Everywhere is patched to include a fix for bug #2096 which - prevented globally installed versions of the extensions from working. It also - includes better protection from Firesheep. See the changelog here: - https://www.eff.org/files/Changelog.txt - -1.3.15: Released 2010-12-17 - update Tor to 0.2.1.28 - update HTTPS-Everywhere to 0.9.9.development.2 - -1.3.16: Released 2010-01-09 - Update Firefox preferences to be more secure and disable geolocation to address #2338 diff --git a/README.Linux b/README.Linux deleted file mode 100644 index 6ce2244..0000000 --- a/README.Linux +++ /dev/null @@ -1,126 +0,0 @@ -Tor Browser Bundle for GNU/Linux -=============== - -Included applications ---------------------- - -Vidalia 0.2.11-svn (with Qt 4.7.1) -Tor 0.2.3.0-alpha-dev (with libevent-2.0.10, zlib-1.2.5 and openssl-1.0.0c) -Firefox 4.0b8 - \_ Torbutton 1.3.1-alpha - |_ HTTPS Everywhere 0.9.9.development.2 - -Usage ------ - -Extract the bundle with: - -tar -xvzf tor-browser-gnu-linux*.tar.gz - -This will create a directory named tor-browser_LANG. Click on this directory or -cd into it and execute the 'start-tor-browser' script. This will start Vidalia. -Once Tor has successfully opened a circuit, Firefox will automatically be -opened. - -To exit, close Firefox. Vidalia will automatically clean up and exit. - -Changelog ---------- - -x.x.x: NOT FOR PUBLIC RELEASE - THIS IS A TEST BUNDLE - -1.1.2: Released 2011-01-09 - Update Firefox preferences to be more secure and disable geolocation to address #2338 - -1.1.1: Released 2010-12-17 - Update Tor to 0.2.2.20-alpha - Update HTTPS Everywhere to 0.9.9.development.2 - -1.1.0: Released 2010-12-13 - Update Firefox to 3.6.13 - Update NoScript to 2.0.7 - Update HTTPS Everywhere to 0.9.9.development.1 - This version of HTTPS-Everywhere is patched to include a fix for bug #2096 which - prevented globally installed versions of the extension from working. It also - includes better protection from Firesheep. See the changelog here: - https://www.eff.org/files/Changelog.txt - Add Chris Davis's patch <https://bugzilla.mozilla.org/show_bug.cgi?id=280661> - This patch improves Firefox's SOCKS support and eliminates the need for Polipo, so - Torbutton has been reconfigured to just use a SOCKS proxy. Polipo has been removed - entirely from this release of the Tor Browser Bundle. If this causes you problems, - please file a bug: https://trac.torproject.org/projects/tor - Rebuild all binaries against glibc 2.7 so they work for older distros again - -1.0.17: Released 2010-11-24 - Update Tor to 0.2.2.19-alpha - -1.0.16: Released 2010-11-16 - Update Tor to 0.2.2.18-alpha - Update OpenSSL to 0.9.8p (see CVE-2010-3864) - Update NoScript to 2.0.5.1 - -1.0.15: Released 2010-10-28 - Update Firefox to 3.6.12 - -1.0.14: Released 2010-10-24 - Update Firefox to 3.6.11 - -1.0.13: Released 2010-10-01 - Update Tor to 0.2.2.17-alpha - Update Firefox to 3.6.10 - -1.0.12: Released 2010-09-18 - Update Tor to 0.2.2.16-alpha - -1.0.11: Released 2010-09-16 - Update Firefox to 3.6.9 - Update Vidalia to 0.2.10 - -1.0.10: Released 2010-08-20 - Update Tor to 0.2.2.15-alpha - Update Firefox to 3.6.8 - (Mozilla is not doing security and stability updates - for 3.5.x after August 2010) - Update NoScript to 2.0.2.3 - Update BetterPrivacy to 1.48.3 - Update HTTPS Everywhere to 0.2.2 - -1.0.9: Released 2010-07-13 - Update Tor to 0.2.2.14-alpha - -1.0.8: Released 2010-07-05 - Update libpng to 1.4.3 (see CVE-2010-1205) - Update Firefox to 3.5.10 - Update HTTPS Everywhere to 0.2.1 - -1.0.7: Released 2010-06-01 - Rebuild everything against an older glibc so it'll run on more distros - -1.0.6: Released 2010-05-31 - Add arch to tarball name so there's no collision - Add libpng for Arch Linux - Add HTTPS Everywhere extension - Update Qt to 4.6.2 - Update Vidalia to 0.2.9 - Update NoScript to 1.9.9.80 - -1.0.5: Released 2010-05-15 - Fix missing OpenSSL shared library bug - (thanks to bee at http://honeybeenet.altervista.org/homepage/) - -1.0.4: Released 2010-04-24 - Update Tor to 0.2.2.13-alpha - -1.0.3: Released 2010-04-20 - Update Tor to 0.2.2.12-alpha - -1.0.2: Released 2010-04-18 - Update Tor to 0.2.2.10-alpha - Update to Vidalia 0.2.8 - -1.0.1: Released 2010-04-08 - Stop TBB from crashing when it tries to download files - Update Torbutton to 1.2.5 - -1.0.0: Initial release (2010-03-25) diff --git a/README.OSX b/README.OSX deleted file mode 100644 index 6116672..0000000 --- a/README.OSX +++ /dev/null @@ -1,73 +0,0 @@ -Tor Browser Bundle for Mac OS X -=============== - -Included applications ---------------------- - -Vidalia 0.2.10 (with Qt 4.6.2) -Tor 0.2.2.22-alpha (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0c) -Firefox (Namoroka) 3.6.13 - \_ Torbutton 1.2.5 - |_ NoScript 2.0.9.3 - |_ HTTPS-Everywhere 0.9.9.development.2 - |_ BetterPrivacy 1.48.3 - -Usage ------ - -Unzip the TorBrowser zip file that you downloaded. Click on the -TorBrowser_LANG.app inside will launch Vidalia and then Firefox. - -To exit, close Firefox and Vidalia. - -Changelog ---------- - -1.2.0-libevent2: TESTING RELEASE: Released 2011-02-03 - Test Tor Browser Bundle - Update Libevent to 2.0.10-stable - Update OpenSSL to 1.0.0c - Update zlib to 1.2.5 - Remove polipo - This bundle will not work with OS X 10.4 - -1.0.9: Released 2011-01-09 - Update Firefox preferences to be more secure and disable geolocation to address #2338 - -1.0.8: Released 2010-12-17 - Update Tor to 0.2.2.20-alpha - Update HTTPS-Everywhere to 0.9.9.development.2 - -1.0.7: Released 2010-12-14 - Update Firefox to 3.6.13 - Update NoScript to 2.0.7 - Update HTTPS-Everywhere to 0.9.9.development.1 - This version of HTTPS-Everywhere is patched to include a fix for bug #2096 which - prevented globally installed versions of the extension from working. It also - includes better protection from Firesheep. See the changelog here: - https://www.eff.org/files/Changelog.txt - -1.0.6: Released 2010-11-24 - Update Tor to 0.2.2.19-alpha - -1.0.5: Released 2010-11-18 - Update Tor to 0.2.2.18-alpha - Update OpenSSL to 0.9.8p (see CVE-2010-3864) - Update NoScript to 2.0.5.1 - -1.0.4: Released 2010-10-28 - Update Firefox to 3.6.12 - Fix weird Torbutton location so users can tell it's installed - -1.0.3: Released 2010-10-25 - Update Firefox to 3.6.11 - -1.0.2: Released 2010-10-01 - Update Tor to 0.2.2.17-alpha - Update Firefox to 3.6.10 - Add BetterPrivacy 1.48.3 - -1.0.1: Released 2010-09-18 - Update Tor to 0.2.2.16-alpha - -1.0.0: Initial release (2010-09-15) diff --git a/build-scripts/Makefile b/build-scripts/Makefile deleted file mode 100644 index 82abf89..0000000 --- a/build-scripts/Makefile +++ /dev/null @@ -1,346 +0,0 @@ -### -### Makefile for building Tor USB bundle -### -### Copyright 2007 Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> -### See LICENSE for licensing information -### -### $Id$ -### - -##################### -### Configuration ### -##################### - -## Location of required libraries -MING=/c/c/mingw/bin -QT=/c/Qt/4.6.2/bin -OPENSSL=/e/build/openssl-0.9.8p/ - -## Versions -TORBUTTON_VERSION=1.2.5 -FIREFOX_VERSION=3.6.13 -PIDGIN_VERSION=2.7.5 - -## Location of bundle components -VIDALIA=/e/build/vidalia-0.2.10 -TOR=/e/build/tor-0.2.1.28 -POLIPO=/e/build/polipo-1.0.4.1 -FIREFOX_SRC=/e/build/FirefoxPortable-3.6.13 -PIDGIN_SRC=/e/build/PidginPortable-2.7.5 - -## Location of utility applications -PWD:=$(shell pwd) -PYTHON=/c/Python25/python.exe -SEVENZIP="/c/Program Files/7-Zip/7z.exe" -WGET=$(PYTHON) $(PWD)/pyget.py -VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py -WINRAR="/c/Program Files/WinRAR/WinRAR.exe" - -## Size of split archive volumes for WinRAR -SPLITSIZE=1440k - -## Location of config files -CONFIG_SRC=config - -## Destination for the generic bundle -DEST="Generic Bundle" - -## Name of the bundle" -NAME="Tor Browser" - -## Version and name of the compressed bundle (also used for source) -VERSION=1.3.16 -DEFAULT_COMPRESSED_BASENAME=tor-browser- -IM_COMPRESSED_BASENAME=tor-im-browser- -DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION) -IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) - -ifeq ($(USE_PIDGIN),1) -COMPRESSED_NAME=$(IM_COMPRESSED_NAME) -else -COMPRESSED_NAME=$(DEFAULT_COMPRESSED_NAME) -endif - -## Extensions to install by default -DEFAULT_EXTENSIONS=torbutton.xpi - -## Where to download Torbutton from -#TORBUTTON=https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail -TORBUTTON=https://www.torproject.org/torbutton/releases/torbutton-$(TORBUTTON_VERSION).xpi - -## Where to download Mozilla language packs -MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VERSION)/win32/xpi - -## Where Farsi Language Pack can be downloaded from -#FA_LANGPACK=https://addons.mozilla.org/en-US/firefox/downloads/latest/3667/addon-3667-latest.xpi - -## Put more extensions here -EXTENSIONS_DIR=extensions - -## Local overrides --include local.makefile - -############# -### Rules ### -############# - -## -## Default rule -## - -bundle: bundle_en-US - -all-bundles-both: - USE_PIDGIN=1 make all-bundles - make clean - USE_PIDGIN=0 make all-bundles - make clean - -all-bundles: all-compressed-bundles all-split-bundles - -all-compressed-bundles: compressed-bundle_ar \ - compressed-bundle_en-US \ - compressed-bundle_de \ - compressed-bundle_es-ES \ - compressed-bundle_fa \ - compressed-bundle_fr \ - compressed-bundle_nl \ - compressed-bundle_pl \ - compressed-bundle_pt-PT \ - compressed-bundle_ru \ - compressed-bundle_zh-CN \ - compressed-bundle_it \ - compressed-bundle_vi - -all-split-bundles: split-bundle_ar \ - split-bundle_en-US \ - split-bundle_de \ - split-bundle_es-ES \ - split-bundle_fa \ - split-bundle_fr \ - split-bundle_nl \ - split-bundle_pl \ - split-bundle_pt-PT \ - split-bundle_ru \ - split-bundle_zh-CN \ - split-bundle_it \ - split-bundle_vi - -## -## Cleanup -## - -clean: - rm -fr $(DEST) *.stamp - rm -f *~ - rm -fr *.xpi *.jar - rm -fr $(NAME)_* - cd ../src/RelativeLink/ && $(MAKE) clean - -## Also remove the output files -reallyclean: clean - rm -fr $(IM_COMPRESSED_BASENAME)*_*.exe - rm -fr $(IM_COMPRESSED_BASENAME)*_*.rar - rm -fr $(IM_COMPRESSED_BASENAME)*_*_split - rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*.exe - rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*.rar - rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*_split - -## -## Scan .exe files against VirusTotal to check for false positives -## - -virus-scan: - $(VIRUSSCAN) $(VIDALIA)/build/src/vidalia/vidalia.exe - $(VIRUSSCAN) $(POLIPO)/polipo.exe - $(VIRUSSCAN) $(TOR)/src/or/tor.exe - $(VIRUSSCAN) $(TOR)/src/tools/tor-resolve.exe - -## -## Generate a non-localized bundle and put in $(DEST) -## - -## Install binaries, documentation, FirefoxPortable, PidginPortable, and launcher into $(DEST) -generic-bundle.stamp: - make generic-bundle -generic-bundle: directory-structure install-binaries install-docs install-firefoxportable install-pidginportable configure-apps launcher - touch generic-bundle.stamp - -APPDIR=$(DEST)/App -DOCSDIR=$(DEST)/Docs -DATADIR=$(DEST)/Data - -## Build directory structure -directory-structure: - rm -fr $(DEST) - mkdir -p $(APPDIR) - mkdir -p $(DATADIR)/Tor - mkdir -p $(DATADIR)/Vidalia - mkdir -p $(DATADIR)/Polipo - mkdir -p $(DOCSDIR) - -## Package up all the Vidalia and Tor pre-requisites -## Filenames extracted using Dependency Walker <http://www.dependencywalker.com/> -install-binaries: - cp $(MING)/mingwm10.dll $(APPDIR) - cp $(MING)/libgnurx-0.dll $(APPDIR) - cp $(QT)/QtCore4.dll $(QT)/QtGui4.dll $(QT)/QtNetwork4.dll $(QT)/QtXml4.dll $(QT)/libgcc_s_dw2-1.dll $(APPDIR) - cp $(OPENSSL)/ssleay32.dll $(APPDIR) - cp $(OPENSSL)/libeay32.dll $(APPDIR) - cp $(VIDALIA)/build/src/vidalia/vidalia.exe $(APPDIR) - cp $(POLIPO)/polipo.exe $(APPDIR) - cp $(TOR)/src/or/tor.exe $(TOR)/src/tools/tor-resolve.exe $(APPDIR) - -## Collect up license files -install-docs: - mkdir -p $(DOCSDIR)/Vidalia - mkdir -p $(DOCSDIR)/Tor - mkdir -p $(DOCSDIR)/Qt - mkdir -p $(DOCSDIR)/MinGW - mkdir -p $(DOCSDIR)/Polipo - cp $(VIDALIA)/LICENSE* $(VIDALIA)/CREDITS $(DOCSDIR)/Vidalia - cp $(TOR)/LICENSE $(TOR)/AUTHORS $(TOR)/README $(DOCSDIR)/Tor - cp $(QT)/../LICENSE.GPL* $(QT)/../LICENSE.LGPL $(DOCSDIR)/Qt - cp $(MING)/../COPYING $(DOCSDIR)/MinGW - cp $(POLIPO)/COPYING $(POLIPO)/README.Windows $(DOCSDIR)/Polipo - cp ../README $(DOCSDIR)/README-TorBrowserBundle - -## Copy over FirefoxPortable -install-firefoxportable: - cp -R $(FIREFOX_SRC) $(DEST)/FirefoxPortable - -## Copy over PidginPortable -install-pidginportable: -ifeq ($(USE_PIDGIN),1) - cp -R $(PIDGIN_SRC) $(DEST)/PidginPortable -endif - -## Configure Firefox, FirefoxPortable, Vidalia, Polipo and Tor -configure-apps: - ## Configure Firefox preferences - cp $(CONFIG_SRC)/prefs.js $(DEST)/FirefoxPortable/App/DefaultData/profile/ - cp $(CONFIG_SRC)/bookmarks.html $(DEST)/FirefoxPortable/App/DefaultData/profile/ - ## Set up alternate launcher - mv $(DEST)/FirefoxPortable/App/Firefox/firefox.exe $(DEST)/FirefoxPortable/App/Firefox/tbb-firefox.exe - #rm $(DEST)/FirefoxPortable/FirefoxPortable.exe - ## Configure FirefoxPortable - cp $(CONFIG_SRC)/FirefoxPortable.ini $(DEST)/FirefoxPortable - cp $(CONFIG_SRC)/FirefoxPortableSettings.ini $(DEST)/FirefoxPortable/Data/settings - ## Configure PidginPortable -ifeq ($(USE_PIDGIN),1) - cp $(CONFIG_SRC)/PidginPortable.ini $(DEST)/PidginPortable - mkdir -p $(DEST)/PidginPortable/Data/settings/.purple - cp $(CONFIG_SRC)/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple - cp $(CONFIG_SRC)/PidginPortableSettings.ini $(DEST)/PidginPortable/Data/settings -endif - ## Configure Vidalia -ifeq ($(USE_PIDGIN),1) - cp $(CONFIG_SRC)/vidalia.conf.ff+pidgin $(DEST)/Data/Vidalia/vidalia.conf -else - cp $(CONFIG_SRC)/vidalia.conf.ff $(DEST)/Data/Vidalia/vidalia.conf -endif - ## Configure Polipo - cp $(CONFIG_SRC)/polipo.conf $(DEST)/Data/Polipo - ## Configure Tor - cp $(CONFIG_SRC)/torrc $(DEST)/Data/Tor - cp $(TOR)/src/config/geoip $(DEST)/Data/Tor - -launcher: - #echo 'start /b .\\App\\vidalia.exe --datadir .\\Data\\Vidalia\\' > $(DEST)/"Start Tor Browser.bat" - cd ../src/RelativeLink/ && $(MAKE) - cp ../src/RelativeLink/StartTorBrowserBundle.exe $(DEST)/"Start Tor Browser.exe" - -## -## How to create required extensions -## - -## Torbutton development version -torbutton.xpi: - $(WGET) -O $@ $(TORBUTTON) - -## Generic language pack rule -langpack_%.xpi: - $(WGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi -## English comes as default -langpack_en-US.xpi: - touch $@ - -## -## Customize the bundle -## - -bundle_%: - LANGCODE=$* make bundle-localized -compressed-bundle_%: - LANGCODE=$* make compressed-bundle-localized -split-bundle_%: - LANGCODE=$* make split-bundle-localized - -bundle-localized_%.stamp: - make copy-files_$* install-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language - touch bundle-localized_$*.stamp - -bundle-localized: bundle-localized_$(LANGCODE).stamp - -compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp - rm -f $(COMPRESSED_NAME)_$(LANGCODE).exe - cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -mx9 -sfx7z.sfx ../$(COMPRESSED_NAME)_$(LANGCODE).exe $(NAME) - -split-bundle-localized: bundle-localized_$(LANGCODE).stamp - rm -fr $(COMPRESSED_NAME)_$(LANGCODE)_split; mkdir $(COMPRESSED_NAME)_$(LANGCODE)_split - cd $(NAME)_$(LANGCODE); $(WINRAR) a -r -s -ibck -sfx -v$(SPLITSIZE) \ - ../$(COMPRESSED_NAME)_$(LANGCODE)_split/$(COMPRESSED_NAME)_$(LANGCODE)_split.exe $(NAME) - -copy-files_%: generic-bundle.stamp - rm -fr $(NAME)_$* - mkdir $(NAME)_$* - cp -R $(DEST) $(NAME)_$*/$(NAME) - -BUNDLE=$(NAME)_$(LANGCODE)/$(NAME) -DUMMYPROFILE=$(BUNDLE)/FirefoxPortable/App/DummyProfile -install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) - ## Make a dummy profile to stop Firefox creating some large files - cp -R $(BUNDLE)/FirefoxPortable/App/DefaultData $(DUMMYPROFILE) -ifneq ($(LANGCODE), en-US) - mv langpack_$(LANGCODE).xpi $(BUNDLE)/FirefoxPortable/App/Firefox/extensions/langpack-$(LANGCODE)\(a)firefox.mozilla.org.zip - $(SEVENZIP) x -o$(BUNDLE)/FirefoxPortable/App/Firefox/extensions/langpack-$(LANGCODE)\(a)firefox.mozilla.org $(BUNDLE)/FirefoxPortable/App/Firefox/extensions/langpack-$(LANGCODE)\(a)firefox.mozilla.org.zip -endif - rm -fr $(DUMMYPROFILE) - -## Set the language for Vidalia -patch-vidalia-language: - ## Patch Vidalia - ./patch-vidalia-language.sh $(BUNDLE)/Data/Vidalia/vidalia.conf $(LANGCODE) - -## Set the language for Pidgin -patch-pidgin-language: - ## Patch Pidgin -ifeq ($(USE_PIDGIN),1) - ./patch-pidgin-language.sh $(BUNDLE)/PidginPortable/Data/settings/PidginPortableSettings.ini $(LANGCODE) \ - $(BUNDLE)/PidginPortable/App/Pidgin/locale \ - $(BUNDLE)/PidginPortable/App/Pidgin/Gtk/share/locale -endif - -patch-firefox-language: - ## Patch Firefox prefs.js - ./patch-firefox-language.sh $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js $(LANGCODE) - -### -### Utilities -### - -## Copy Firefox preferences from a run of FirefoxPortable to be the default -apply-prefs: - cp $(DEST)/FirefoxPortable/Data/profile/prefs.js $(CONFIG_SRC) - -## Export the source code of the bundle -SRCNAME=$(COMPRESSED_NAME) -SRCDEST=/tmp -SRCDESTPATH=$(SRCDEST)/$(SRCNAME) -srcdist: - rm -fr $(SRCDESTPATH) - git clone git://git.torproject.org/torbrowser.git \ - $(SRCDESTPATH) - cd $(SRCDEST); tar --exclude src/archived-patches \ - --exclude src/current-patches --exclude src/processtest \ - --exclude .git -czvf $(SRCNAME)-src.tar.gz $(SRCNAME)

1 0

[torbrowser/maint-2.3] remove unused files (old READMEs and Makefile)
by erinn＠torproject.org 25 Oct '11

25 Oct '11

commit 553e79eb93eca0ee49b656faf2e62af0641e93c2 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Oct 25 17:03:30 2011 +0100 remove unused files (old READMEs and Makefile) --- README | 319 -------------------------------------------- README.Linux | 126 ------------------ README.OSX | 73 ---------- build-scripts/Makefile | 346 ------------------------------------------------ 4 files changed, 0 insertions(+), 864 deletions(-) diff --git a/README b/README deleted file mode 100644 index f468921..0000000 --- a/README +++ /dev/null @@ -1,319 +0,0 @@ -Tor USB project -=============== - -Included applications ---------------------- - -Vidalia 0.2.10 (with Qt 4.6.2) -Tor 0.2.1.28 (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) -Polipo 1.0.4.1 -FirefoxPortable 3.6.13 - \_ Firefox 3.6.13 - \_ Torbutton 1.2.5 - \_ HTTPS Everywhere 0.9.9.development.2 -PidginPortable 2.7.4 - \_ Pidgin 2.7.5 - \_ OTR 3.2 - -Usage ------ - -Tor Browser.exe is a 7zip self extracting archive. To extract the bundle, run -this and point it to the install location. It will create a folder called "Tor -Browser". This may be the hard disk, but is more likely the currently mounted -USB drive. The install process needs only be performed once. - -Once the bundle is extracted, open the newly created folder and click -"Start Tor Browser.bat" (may appear as simply "Start Tor Browser"). -This will start Vidalia. Once Tor has successfully opened a circuit, -Firefox will automatically be opened. - -To exit, close Firefox. Vidalia will automatically clean up and exit. - -Changelog ---------- - -0.0.1: Initial revision (2007-12-11) -0.0.2: Update Vidalia to r2213 (2007-12-13) - Update Tor to 0.2.0.12-alpha - Add license files - Remove Portable Tor dependency - Add bookmarks to Tor, Torcheck and the hidden wiki -0.0.3: Move build infrastructure to GNU Make (2007-12-16) - Install Torbutton -0.0.4: Add internationalization for fa-IR and zh-CN - Add Makefile rule for installing Quick Locale Switcher, but - don't enable this by default -0.0.5: Disable FirefoxPortable splash screen (2007-12-24) - New prefs.js: - - Disable history storage - - Disable <a ping> handling - - Disable session storage (crash recovery) - - Disable logging of CSS errors - - Disable persistent cookies - - Disable IPv6 - - Disable external protocol handlers - - Disable failover to a secondary proxy - - Sanitize cookies and passwords on shutdown - - Prevent scripts calling plugins - - Empty add-on installation whitelist -0.0.6: Released 2008-01-29 - Rename start file "Start Tor Browser" so as to be easier to explain - Location of wget is now a configurable parameter - Vidalia updated to r2337 (for ProxyExecutable(Arguments) options - Tor updated to 0.2.0.18-alpha - Polipo 1.0.4 now included in bundle and Firefox configured - Firefox now configured to use proxies at 127.0.0.1 to prevent IPv6 attempt -0.0.7: Released 2008-02-08 - Security update of FirefoxPortable to v2.0.12 (see - http://www.mozilla.org/projects/security/known-vulnerabilities.html#Firefox) -0.0.8: Released 2008-02-15 - Security update of Torbutton to v1.1.13 (see - http://torbutton.torproject.org/dev/CHANGELOG) - Automate generation of internationalized bundles - Allow optional extensions to be placed in build-scripts/extensions - Build Polipo with regular expression support, activating forbiddenFile option - Update Polipo configuration based on Incognito suggestions -1.0.0: Released 2008-03-20 - Fix parse errors in polipo.conf (Phillip) - Move to HTTPS and specify language in homepage URL (check.torproject.org) - Update Vidalia license - Fix Makefile error when re-building the bundle - Update of Tor to 0.2.0.22-rc - Update of Torbutton to v1.1.17 (see - http://torbutton.torproject.org/dev/CHANGELOG) - Update of Vidalia to revision 2424 - Suppress warning on viewing an encrypted page -1.0.1: Released 2008-03-26 - Install .jar files placed in /extensions, as well as .xpi files - Update of Firefox to 2.0.0.13 to fix security problems (see - http://www.mozilla.org/projects/security/known-vulnerabilities.html#firefox…) - Update of Vidalia to revision 2464 - Update of Tor to 0.2.0.23-rc - Update prefs.js for new Torbutton defaults -1.0.2: Released 2008-05-03 - Update Vidalia to revision 2539 - Update Tor to 0.2.0.25-rc - Update FirefoxPortable to 2.0.0.14 - Update Torbutton to 1.1.18 - Add RunProxyAtStart to vidalia.conf (now required) -1.0.3: Released 2008-05-16 - Update Tor to 0.2.0.26-rc -1.1.0: Released 2008-06-13 - Replace startup batch script with application (RelativeLink), so there is a helpful icon - Make Qt 4.3.5 the default version - Optionally install Pidgin (for Tor IM Browser Bundle) - Extended INSTALL documentation - Optionally use WinRAR to produce a self-extracting split bundle - Update Vidalia to revision 2718 - Update Tor to 0.2.1.1-alpha - Update OpenSSL to 0.9.8h -1.1.1: Released 2008-07-20 - Update Vidalia to release 0.1.6 (we now longer need to track SVN trunk) - Update Pidgin Portable to 2.4.3 - Update Pidgin OTR plugin to 3.2 - Update Tor to 0.2.1.2-alpha - Update Torbutton to 1.2.0rc6 - Set TZ=UTC environment variable in RelativeLink (needed by Torbutton) -1.1.2: Released 2008-08-09 - Don't set TZ environment variable in RelativeLink (now done by Vidalia 0.1.7) - Update Vidalia to release 0.1.7 - Update Tor to 0.2.1.4-alpha - Update Firefox to 2.0.0.16 -1.1.3: Released 2008-08-22 - Fix homepage so that it is properly localized - Add &small=1 to homepage URL to request a more discreet page - Update Vidalia to release 0.1.8 -1.1.4: Released 2008-10-13 - Update Vidalia to release 0.1.9 - Update Tor to 0.2.1.6-alpha - Update Firefox to 2.0.0.16 - Update Pidgin to 2.5.1 -1.1.5: Released 2008-12-01 - Set AllowMultipleInstances=true, to allow Tor Browser Bundle and - Firefox to be run at the same time (suggested by John Brooks) - Update Vidalia to release 0.1.10 - Update Firefox to 2.0.0.18 - Update Tor to 0.2.1.7-alpha - Update Pidgin to 2.5.2 - Added a small patch and instructions to fix Qt compile time error - Corrected some minor mistakes in the INSTALL document - Updated INSTALL document to reflect updated build process -1.1.6: Released 2008-12-02 - Set AllowMultipleInstances=false, this isn't ready for primetime -1.1.7: Released 2008-12-12 - Update Tor to 0.2.1.8-alpha - Fix issue with OTR (The Pidgin wasn't in the right directory) - Update INSTALL document to reflect updated version numbers -1.1.8: Released 2009-01-22 - Update Tor to 0.2.1.11-alpha (security update) - Update OpenSSL to 0.9.8j (security update) - Update Firefox to 3.0.5 - Update Pidgin to 2.5.4 - Update libevent to 1.4.9 - -1.1.9: Released 2009-02-18 - Update Tor to 0.2.1.12-alpha - Update Firefox to 3.0.6 - Update Vidalia to 0.1.11 - -1.1.10: Released 2009-03-10 - Update Tor to 0.2.1.13-alpha - Update Firefox to 3.0.7 - Update Pidgin to 2.5.5 - -1.1.11: Released 2009-03-31 - Update Firefox to 3.0.8 - Add Italian language bundles - Update Torbutton to 1.2.1 - Update Vidalia to 0.1.12 - -1.1.12: Released 2009-04-12 - Update OpenSSL to 0.9.8k - Update Tor to 0.2.1.14-rc - -1.2.0: Released 2009-05-25 - Switch to launching Firefox directly from Vidalia to - allow multiple instances of Firefox - Update Firefox to 3.0.10 - Update to Qt 4.5.1 - Update Firefox prefs.js to stop scanning for plugins - Update libevent to 1.4.11 - Include the Tor geoip database - Update Vidalia to 0.1.13 - Update Tor to 0.2.1.15-rc - -1.2.1: Released 2009-06-21 - Better updates to Firefox to stop scanning for plugins on start - Update Pidgin to 2.5.6r2 - Update Firefox to 3.0.11 - Include OpenSSL 0.9.8k DLL and stop using the system ssl dll - Update Tor to 0.2.1.16-rc - -1.2.2: Released 2009-06-23 - Update Pidgin to 2.5.7 - -1.2.3: Released 2009-07-08 - Update Vidalia to 0.1.14 - Update Tor to 0.2.1.17-rc - Update Pidgin to 2.5.8 - -1.2.4: Released 2009-07-11 - Include libeay32.dll from OpenSSL 0.9.8k to make QT happy - Update Vidalia to 0.1.15 - -1.2.5: Released 2009-07-25 - update Tor to 0.2.1.18 - -1.2.6: Released 2009-07-28 - update Tor to 0.2.1.19 - -1.2.7: Released 2009-08-04 - update Firefox to 3.0.13 - add Polish translation - update libevent to 1.4.12 - -1.2.8: Released 2009-08-19 - update Torbutton to 1.2.2 - update Vidalia to 0.2.2 - compile OpenSSL 0.9.8k with Visual C to make dlls - update Pidgin to 2.6.1 - -1.2.9: Released 2009-09-11 - update Vidalia to 0.2.4 - update Qt to 4.5.2 - update Pidgin to 2.6.2 - update Firefox to 3.0.14 - -1.2.10: Released 2009-11-20 - update Vidalia to 0.2.6 - update Pidgin to 2.6.3 - update Tor to 0.2.1.20 - update Firefox to 3.0.15 - update OpenSSL to 0.9.8l - update libevent to 1.4.13 - -1.3.0: Released 2009-12:31 - upgrade Firefox to 3.5.6 - update Pidgin to 2.6.4 - update Torbutton to 1.2.4 - update Tor to 0.2.1.21 - -1.3.1: Released 2010-01-22 - update Firefox to 3.5.7 - update Pidgin to 2.6.5 - update Tor to 0.2.1.22 - -1.3.2: Released 2010-02-15 - update Vidalia to 0.2.7 - update Tor to 0.2.1.23 - update Qt to 4.6.2 - update Polipo to 1.4.0.1 - configure pidgin to not log chats by default - -1.3.3: Released 2010-02-27 - update Firefox to 3.5.8 - update Pidgin to 2.6.6 - update Tor to 0.2.1.24 - -1.3.4: Released 2010-04-04 - update Firefox to 3.5.9 - update Tor to 0.2.1.25 - -1.3.5: Released 2010-05-03 - add Vietnamese language - update Torbutton to 1.2.5 - update Tor to 0.2.1.26 - -1.3.6: Released 2010-05-26 - update Vidalia to 0.2.9 - -1.3.7: Released 2010-07-04 - update Pidgin to 2.7.1r2 - update Firefox to 3.5.10 - -1.3.8: Released 2010-07-22 - update Firefox to 3.5.11 - -1.3.9: Released 2010-07-22 - update Pidgin to 2.7.2 - -1.3.10: Released 2010-09-28 - update Vidalia to 0.2.10 - update Firefox to 3.6.10 - add new extensions: - Better Privacy 1.48.3 - NoScript 2.0.3.2 - HTTPS Everywhere 0.2.2 - -1.3.11: Released 2010-10-25 - update Firefox to 3.6.11 - update Pidgin to 2.7.4 - -1.3.12: Released 2010-10-28 - update Firefox to 3.6.12 - -1.3.13: Released 2010-11-25 - update Tor to 0.2.1.27 - update Pidgin to 2.7.5 - update OpenSSL to 0.9.8p - fix Firefox extension install path so extensions show in the installed add-ons list - disable Firefox's ability to search the Windows registry path for system-wide - plugins and extensions (closes: #2118) - remove NoScript and BetterPrivacy from stable bundle until they receive more - testing - -1.3.14: Released 2010-12-13 - update Firefox to 3.6.13 - update HTTPS-Everywhere to 0.9.9.development.1 - This version of HTTPS-Everywhere is patched to include a fix for bug #2096 which - prevented globally installed versions of the extensions from working. It also - includes better protection from Firesheep. See the changelog here: - https://www.eff.org/files/Changelog.txt - -1.3.15: Released 2010-12-17 - update Tor to 0.2.1.28 - update HTTPS-Everywhere to 0.9.9.development.2 - -1.3.16: Released 2010-01-09 - Update Firefox preferences to be more secure and disable geolocation to address #2338 diff --git a/README.Linux b/README.Linux deleted file mode 100644 index 6ce2244..0000000 --- a/README.Linux +++ /dev/null @@ -1,126 +0,0 @@ -Tor Browser Bundle for GNU/Linux -=============== - -Included applications ---------------------- - -Vidalia 0.2.11-svn (with Qt 4.7.1) -Tor 0.2.3.0-alpha-dev (with libevent-2.0.10, zlib-1.2.5 and openssl-1.0.0c) -Firefox 4.0b8 - \_ Torbutton 1.3.1-alpha - |_ HTTPS Everywhere 0.9.9.development.2 - -Usage ------ - -Extract the bundle with: - -tar -xvzf tor-browser-gnu-linux*.tar.gz - -This will create a directory named tor-browser_LANG. Click on this directory or -cd into it and execute the 'start-tor-browser' script. This will start Vidalia. -Once Tor has successfully opened a circuit, Firefox will automatically be -opened. - -To exit, close Firefox. Vidalia will automatically clean up and exit. - -Changelog ---------- - -x.x.x: NOT FOR PUBLIC RELEASE - THIS IS A TEST BUNDLE - -1.1.2: Released 2011-01-09 - Update Firefox preferences to be more secure and disable geolocation to address #2338 - -1.1.1: Released 2010-12-17 - Update Tor to 0.2.2.20-alpha - Update HTTPS Everywhere to 0.9.9.development.2 - -1.1.0: Released 2010-12-13 - Update Firefox to 3.6.13 - Update NoScript to 2.0.7 - Update HTTPS Everywhere to 0.9.9.development.1 - This version of HTTPS-Everywhere is patched to include a fix for bug #2096 which - prevented globally installed versions of the extension from working. It also - includes better protection from Firesheep. See the changelog here: - https://www.eff.org/files/Changelog.txt - Add Chris Davis's patch <https://bugzilla.mozilla.org/show_bug.cgi?id=280661> - This patch improves Firefox's SOCKS support and eliminates the need for Polipo, so - Torbutton has been reconfigured to just use a SOCKS proxy. Polipo has been removed - entirely from this release of the Tor Browser Bundle. If this causes you problems, - please file a bug: https://trac.torproject.org/projects/tor - Rebuild all binaries against glibc 2.7 so they work for older distros again - -1.0.17: Released 2010-11-24 - Update Tor to 0.2.2.19-alpha - -1.0.16: Released 2010-11-16 - Update Tor to 0.2.2.18-alpha - Update OpenSSL to 0.9.8p (see CVE-2010-3864) - Update NoScript to 2.0.5.1 - -1.0.15: Released 2010-10-28 - Update Firefox to 3.6.12 - -1.0.14: Released 2010-10-24 - Update Firefox to 3.6.11 - -1.0.13: Released 2010-10-01 - Update Tor to 0.2.2.17-alpha - Update Firefox to 3.6.10 - -1.0.12: Released 2010-09-18 - Update Tor to 0.2.2.16-alpha - -1.0.11: Released 2010-09-16 - Update Firefox to 3.6.9 - Update Vidalia to 0.2.10 - -1.0.10: Released 2010-08-20 - Update Tor to 0.2.2.15-alpha - Update Firefox to 3.6.8 - (Mozilla is not doing security and stability updates - for 3.5.x after August 2010) - Update NoScript to 2.0.2.3 - Update BetterPrivacy to 1.48.3 - Update HTTPS Everywhere to 0.2.2 - -1.0.9: Released 2010-07-13 - Update Tor to 0.2.2.14-alpha - -1.0.8: Released 2010-07-05 - Update libpng to 1.4.3 (see CVE-2010-1205) - Update Firefox to 3.5.10 - Update HTTPS Everywhere to 0.2.1 - -1.0.7: Released 2010-06-01 - Rebuild everything against an older glibc so it'll run on more distros - -1.0.6: Released 2010-05-31 - Add arch to tarball name so there's no collision - Add libpng for Arch Linux - Add HTTPS Everywhere extension - Update Qt to 4.6.2 - Update Vidalia to 0.2.9 - Update NoScript to 1.9.9.80 - -1.0.5: Released 2010-05-15 - Fix missing OpenSSL shared library bug - (thanks to bee at http://honeybeenet.altervista.org/homepage/) - -1.0.4: Released 2010-04-24 - Update Tor to 0.2.2.13-alpha - -1.0.3: Released 2010-04-20 - Update Tor to 0.2.2.12-alpha - -1.0.2: Released 2010-04-18 - Update Tor to 0.2.2.10-alpha - Update to Vidalia 0.2.8 - -1.0.1: Released 2010-04-08 - Stop TBB from crashing when it tries to download files - Update Torbutton to 1.2.5 - -1.0.0: Initial release (2010-03-25) diff --git a/README.OSX b/README.OSX deleted file mode 100644 index 6116672..0000000 --- a/README.OSX +++ /dev/null @@ -1,73 +0,0 @@ -Tor Browser Bundle for Mac OS X -=============== - -Included applications ---------------------- - -Vidalia 0.2.10 (with Qt 4.6.2) -Tor 0.2.2.22-alpha (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0c) -Firefox (Namoroka) 3.6.13 - \_ Torbutton 1.2.5 - |_ NoScript 2.0.9.3 - |_ HTTPS-Everywhere 0.9.9.development.2 - |_ BetterPrivacy 1.48.3 - -Usage ------ - -Unzip the TorBrowser zip file that you downloaded. Click on the -TorBrowser_LANG.app inside will launch Vidalia and then Firefox. - -To exit, close Firefox and Vidalia. - -Changelog ---------- - -1.2.0-libevent2: TESTING RELEASE: Released 2011-02-03 - Test Tor Browser Bundle - Update Libevent to 2.0.10-stable - Update OpenSSL to 1.0.0c - Update zlib to 1.2.5 - Remove polipo - This bundle will not work with OS X 10.4 - -1.0.9: Released 2011-01-09 - Update Firefox preferences to be more secure and disable geolocation to address #2338 - -1.0.8: Released 2010-12-17 - Update Tor to 0.2.2.20-alpha - Update HTTPS-Everywhere to 0.9.9.development.2 - -1.0.7: Released 2010-12-14 - Update Firefox to 3.6.13 - Update NoScript to 2.0.7 - Update HTTPS-Everywhere to 0.9.9.development.1 - This version of HTTPS-Everywhere is patched to include a fix for bug #2096 which - prevented globally installed versions of the extension from working. It also - includes better protection from Firesheep. See the changelog here: - https://www.eff.org/files/Changelog.txt - -1.0.6: Released 2010-11-24 - Update Tor to 0.2.2.19-alpha - -1.0.5: Released 2010-11-18 - Update Tor to 0.2.2.18-alpha - Update OpenSSL to 0.9.8p (see CVE-2010-3864) - Update NoScript to 2.0.5.1 - -1.0.4: Released 2010-10-28 - Update Firefox to 3.6.12 - Fix weird Torbutton location so users can tell it's installed - -1.0.3: Released 2010-10-25 - Update Firefox to 3.6.11 - -1.0.2: Released 2010-10-01 - Update Tor to 0.2.2.17-alpha - Update Firefox to 3.6.10 - Add BetterPrivacy 1.48.3 - -1.0.1: Released 2010-09-18 - Update Tor to 0.2.2.16-alpha - -1.0.0: Initial release (2010-09-15) diff --git a/build-scripts/Makefile b/build-scripts/Makefile deleted file mode 100644 index 82abf89..0000000 --- a/build-scripts/Makefile +++ /dev/null @@ -1,346 +0,0 @@ -### -### Makefile for building Tor USB bundle -### -### Copyright 2007 Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> -### See LICENSE for licensing information -### -### $Id$ -### - -##################### -### Configuration ### -##################### - -## Location of required libraries -MING=/c/c/mingw/bin -QT=/c/Qt/4.6.2/bin -OPENSSL=/e/build/openssl-0.9.8p/ - -## Versions -TORBUTTON_VERSION=1.2.5 -FIREFOX_VERSION=3.6.13 -PIDGIN_VERSION=2.7.5 - -## Location of bundle components -VIDALIA=/e/build/vidalia-0.2.10 -TOR=/e/build/tor-0.2.1.28 -POLIPO=/e/build/polipo-1.0.4.1 -FIREFOX_SRC=/e/build/FirefoxPortable-3.6.13 -PIDGIN_SRC=/e/build/PidginPortable-2.7.5 - -## Location of utility applications -PWD:=$(shell pwd) -PYTHON=/c/Python25/python.exe -SEVENZIP="/c/Program Files/7-Zip/7z.exe" -WGET=$(PYTHON) $(PWD)/pyget.py -VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py -WINRAR="/c/Program Files/WinRAR/WinRAR.exe" - -## Size of split archive volumes for WinRAR -SPLITSIZE=1440k - -## Location of config files -CONFIG_SRC=config - -## Destination for the generic bundle -DEST="Generic Bundle" - -## Name of the bundle" -NAME="Tor Browser" - -## Version and name of the compressed bundle (also used for source) -VERSION=1.3.16 -DEFAULT_COMPRESSED_BASENAME=tor-browser- -IM_COMPRESSED_BASENAME=tor-im-browser- -DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION) -IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) - -ifeq ($(USE_PIDGIN),1) -COMPRESSED_NAME=$(IM_COMPRESSED_NAME) -else -COMPRESSED_NAME=$(DEFAULT_COMPRESSED_NAME) -endif - -## Extensions to install by default -DEFAULT_EXTENSIONS=torbutton.xpi - -## Where to download Torbutton from -#TORBUTTON=https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail -TORBUTTON=https://www.torproject.org/torbutton/releases/torbutton-$(TORBUTTON_VERSION).xpi - -## Where to download Mozilla language packs -MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VERSION)/win32/xpi - -## Where Farsi Language Pack can be downloaded from -#FA_LANGPACK=https://addons.mozilla.org/en-US/firefox/downloads/latest/3667/addon-3667-latest.xpi - -## Put more extensions here -EXTENSIONS_DIR=extensions - -## Local overrides --include local.makefile - -############# -### Rules ### -############# - -## -## Default rule -## - -bundle: bundle_en-US - -all-bundles-both: - USE_PIDGIN=1 make all-bundles - make clean - USE_PIDGIN=0 make all-bundles - make clean - -all-bundles: all-compressed-bundles all-split-bundles - -all-compressed-bundles: compressed-bundle_ar \ - compressed-bundle_en-US \ - compressed-bundle_de \ - compressed-bundle_es-ES \ - compressed-bundle_fa \ - compressed-bundle_fr \ - compressed-bundle_nl \ - compressed-bundle_pl \ - compressed-bundle_pt-PT \ - compressed-bundle_ru \ - compressed-bundle_zh-CN \ - compressed-bundle_it \ - compressed-bundle_vi - -all-split-bundles: split-bundle_ar \ - split-bundle_en-US \ - split-bundle_de \ - split-bundle_es-ES \ - split-bundle_fa \ - split-bundle_fr \ - split-bundle_nl \ - split-bundle_pl \ - split-bundle_pt-PT \ - split-bundle_ru \ - split-bundle_zh-CN \ - split-bundle_it \ - split-bundle_vi - -## -## Cleanup -## - -clean: - rm -fr $(DEST) *.stamp - rm -f *~ - rm -fr *.xpi *.jar - rm -fr $(NAME)_* - cd ../src/RelativeLink/ && $(MAKE) clean - -## Also remove the output files -reallyclean: clean - rm -fr $(IM_COMPRESSED_BASENAME)*_*.exe - rm -fr $(IM_COMPRESSED_BASENAME)*_*.rar - rm -fr $(IM_COMPRESSED_BASENAME)*_*_split - rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*.exe - rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*.rar - rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*_split - -## -## Scan .exe files against VirusTotal to check for false positives -## - -virus-scan: - $(VIRUSSCAN) $(VIDALIA)/build/src/vidalia/vidalia.exe - $(VIRUSSCAN) $(POLIPO)/polipo.exe - $(VIRUSSCAN) $(TOR)/src/or/tor.exe - $(VIRUSSCAN) $(TOR)/src/tools/tor-resolve.exe - -## -## Generate a non-localized bundle and put in $(DEST) -## - -## Install binaries, documentation, FirefoxPortable, PidginPortable, and launcher into $(DEST) -generic-bundle.stamp: - make generic-bundle -generic-bundle: directory-structure install-binaries install-docs install-firefoxportable install-pidginportable configure-apps launcher - touch generic-bundle.stamp - -APPDIR=$(DEST)/App -DOCSDIR=$(DEST)/Docs -DATADIR=$(DEST)/Data - -## Build directory structure -directory-structure: - rm -fr $(DEST) - mkdir -p $(APPDIR) - mkdir -p $(DATADIR)/Tor - mkdir -p $(DATADIR)/Vidalia - mkdir -p $(DATADIR)/Polipo - mkdir -p $(DOCSDIR) - -## Package up all the Vidalia and Tor pre-requisites -## Filenames extracted using Dependency Walker <http://www.dependencywalker.com/> -install-binaries: - cp $(MING)/mingwm10.dll $(APPDIR) - cp $(MING)/libgnurx-0.dll $(APPDIR) - cp $(QT)/QtCore4.dll $(QT)/QtGui4.dll $(QT)/QtNetwork4.dll $(QT)/QtXml4.dll $(QT)/libgcc_s_dw2-1.dll $(APPDIR) - cp $(OPENSSL)/ssleay32.dll $(APPDIR) - cp $(OPENSSL)/libeay32.dll $(APPDIR) - cp $(VIDALIA)/build/src/vidalia/vidalia.exe $(APPDIR) - cp $(POLIPO)/polipo.exe $(APPDIR) - cp $(TOR)/src/or/tor.exe $(TOR)/src/tools/tor-resolve.exe $(APPDIR) - -## Collect up license files -install-docs: - mkdir -p $(DOCSDIR)/Vidalia - mkdir -p $(DOCSDIR)/Tor - mkdir -p $(DOCSDIR)/Qt - mkdir -p $(DOCSDIR)/MinGW - mkdir -p $(DOCSDIR)/Polipo - cp $(VIDALIA)/LICENSE* $(VIDALIA)/CREDITS $(DOCSDIR)/Vidalia - cp $(TOR)/LICENSE $(TOR)/AUTHORS $(TOR)/README $(DOCSDIR)/Tor - cp $(QT)/../LICENSE.GPL* $(QT)/../LICENSE.LGPL $(DOCSDIR)/Qt - cp $(MING)/../COPYING $(DOCSDIR)/MinGW - cp $(POLIPO)/COPYING $(POLIPO)/README.Windows $(DOCSDIR)/Polipo - cp ../README $(DOCSDIR)/README-TorBrowserBundle - -## Copy over FirefoxPortable -install-firefoxportable: - cp -R $(FIREFOX_SRC) $(DEST)/FirefoxPortable - -## Copy over PidginPortable -install-pidginportable: -ifeq ($(USE_PIDGIN),1) - cp -R $(PIDGIN_SRC) $(DEST)/PidginPortable -endif - -## Configure Firefox, FirefoxPortable, Vidalia, Polipo and Tor -configure-apps: - ## Configure Firefox preferences - cp $(CONFIG_SRC)/prefs.js $(DEST)/FirefoxPortable/App/DefaultData/profile/ - cp $(CONFIG_SRC)/bookmarks.html $(DEST)/FirefoxPortable/App/DefaultData/profile/ - ## Set up alternate launcher - mv $(DEST)/FirefoxPortable/App/Firefox/firefox.exe $(DEST)/FirefoxPortable/App/Firefox/tbb-firefox.exe - #rm $(DEST)/FirefoxPortable/FirefoxPortable.exe - ## Configure FirefoxPortable - cp $(CONFIG_SRC)/FirefoxPortable.ini $(DEST)/FirefoxPortable - cp $(CONFIG_SRC)/FirefoxPortableSettings.ini $(DEST)/FirefoxPortable/Data/settings - ## Configure PidginPortable -ifeq ($(USE_PIDGIN),1) - cp $(CONFIG_SRC)/PidginPortable.ini $(DEST)/PidginPortable - mkdir -p $(DEST)/PidginPortable/Data/settings/.purple - cp $(CONFIG_SRC)/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple - cp $(CONFIG_SRC)/PidginPortableSettings.ini $(DEST)/PidginPortable/Data/settings -endif - ## Configure Vidalia -ifeq ($(USE_PIDGIN),1) - cp $(CONFIG_SRC)/vidalia.conf.ff+pidgin $(DEST)/Data/Vidalia/vidalia.conf -else - cp $(CONFIG_SRC)/vidalia.conf.ff $(DEST)/Data/Vidalia/vidalia.conf -endif - ## Configure Polipo - cp $(CONFIG_SRC)/polipo.conf $(DEST)/Data/Polipo - ## Configure Tor - cp $(CONFIG_SRC)/torrc $(DEST)/Data/Tor - cp $(TOR)/src/config/geoip $(DEST)/Data/Tor - -launcher: - #echo 'start /b .\\App\\vidalia.exe --datadir .\\Data\\Vidalia\\' > $(DEST)/"Start Tor Browser.bat" - cd ../src/RelativeLink/ && $(MAKE) - cp ../src/RelativeLink/StartTorBrowserBundle.exe $(DEST)/"Start Tor Browser.exe" - -## -## How to create required extensions -## - -## Torbutton development version -torbutton.xpi: - $(WGET) -O $@ $(TORBUTTON) - -## Generic language pack rule -langpack_%.xpi: - $(WGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi -## English comes as default -langpack_en-US.xpi: - touch $@ - -## -## Customize the bundle -## - -bundle_%: - LANGCODE=$* make bundle-localized -compressed-bundle_%: - LANGCODE=$* make compressed-bundle-localized -split-bundle_%: - LANGCODE=$* make split-bundle-localized - -bundle-localized_%.stamp: - make copy-files_$* install-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language - touch bundle-localized_$*.stamp - -bundle-localized: bundle-localized_$(LANGCODE).stamp - -compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp - rm -f $(COMPRESSED_NAME)_$(LANGCODE).exe - cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -mx9 -sfx7z.sfx ../$(COMPRESSED_NAME)_$(LANGCODE).exe $(NAME) - -split-bundle-localized: bundle-localized_$(LANGCODE).stamp - rm -fr $(COMPRESSED_NAME)_$(LANGCODE)_split; mkdir $(COMPRESSED_NAME)_$(LANGCODE)_split - cd $(NAME)_$(LANGCODE); $(WINRAR) a -r -s -ibck -sfx -v$(SPLITSIZE) \ - ../$(COMPRESSED_NAME)_$(LANGCODE)_split/$(COMPRESSED_NAME)_$(LANGCODE)_split.exe $(NAME) - -copy-files_%: generic-bundle.stamp - rm -fr $(NAME)_$* - mkdir $(NAME)_$* - cp -R $(DEST) $(NAME)_$*/$(NAME) - -BUNDLE=$(NAME)_$(LANGCODE)/$(NAME) -DUMMYPROFILE=$(BUNDLE)/FirefoxPortable/App/DummyProfile -install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) - ## Make a dummy profile to stop Firefox creating some large files - cp -R $(BUNDLE)/FirefoxPortable/App/DefaultData $(DUMMYPROFILE) -ifneq ($(LANGCODE), en-US) - mv langpack_$(LANGCODE).xpi $(BUNDLE)/FirefoxPortable/App/Firefox/extensions/langpack-$(LANGCODE)\(a)firefox.mozilla.org.zip - $(SEVENZIP) x -o$(BUNDLE)/FirefoxPortable/App/Firefox/extensions/langpack-$(LANGCODE)\(a)firefox.mozilla.org $(BUNDLE)/FirefoxPortable/App/Firefox/extensions/langpack-$(LANGCODE)\(a)firefox.mozilla.org.zip -endif - rm -fr $(DUMMYPROFILE) - -## Set the language for Vidalia -patch-vidalia-language: - ## Patch Vidalia - ./patch-vidalia-language.sh $(BUNDLE)/Data/Vidalia/vidalia.conf $(LANGCODE) - -## Set the language for Pidgin -patch-pidgin-language: - ## Patch Pidgin -ifeq ($(USE_PIDGIN),1) - ./patch-pidgin-language.sh $(BUNDLE)/PidginPortable/Data/settings/PidginPortableSettings.ini $(LANGCODE) \ - $(BUNDLE)/PidginPortable/App/Pidgin/locale \ - $(BUNDLE)/PidginPortable/App/Pidgin/Gtk/share/locale -endif - -patch-firefox-language: - ## Patch Firefox prefs.js - ./patch-firefox-language.sh $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js $(LANGCODE) - -### -### Utilities -### - -## Copy Firefox preferences from a run of FirefoxPortable to be the default -apply-prefs: - cp $(DEST)/FirefoxPortable/Data/profile/prefs.js $(CONFIG_SRC) - -## Export the source code of the bundle -SRCNAME=$(COMPRESSED_NAME) -SRCDEST=/tmp -SRCDESTPATH=$(SRCDEST)/$(SRCNAME) -srcdist: - rm -fr $(SRCDESTPATH) - git clone git://git.torproject.org/torbrowser.git \ - $(SRCDESTPATH) - cd $(SRCDEST); tar --exclude src/archived-patches \ - --exclude src/current-patches --exclude src/processtest \ - --exclude .git -czvf $(SRCNAME)-src.tar.gz $(SRCNAME)

1 0

[torbrowser/master] remove unused files (old READMEs and Makefile)
by erinn＠torproject.org 25 Oct '11

25 Oct '11

commit 553e79eb93eca0ee49b656faf2e62af0641e93c2 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Oct 25 17:03:30 2011 +0100 remove unused files (old READMEs and Makefile) --- README | 319 -------------------------------------------- README.Linux | 126 ------------------ README.OSX | 73 ---------- build-scripts/Makefile | 346 ------------------------------------------------ 4 files changed, 0 insertions(+), 864 deletions(-) diff --git a/README b/README deleted file mode 100644 index f468921..0000000 --- a/README +++ /dev/null @@ -1,319 +0,0 @@ -Tor USB project -=============== - -Included applications ---------------------- - -Vidalia 0.2.10 (with Qt 4.6.2) -Tor 0.2.1.28 (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) -Polipo 1.0.4.1 -FirefoxPortable 3.6.13 - \_ Firefox 3.6.13 - \_ Torbutton 1.2.5 - \_ HTTPS Everywhere 0.9.9.development.2 -PidginPortable 2.7.4 - \_ Pidgin 2.7.5 - \_ OTR 3.2 - -Usage ------ - -Tor Browser.exe is a 7zip self extracting archive. To extract the bundle, run -this and point it to the install location. It will create a folder called "Tor -Browser". This may be the hard disk, but is more likely the currently mounted -USB drive. The install process needs only be performed once. - -Once the bundle is extracted, open the newly created folder and click -"Start Tor Browser.bat" (may appear as simply "Start Tor Browser"). -This will start Vidalia. Once Tor has successfully opened a circuit, -Firefox will automatically be opened. - -To exit, close Firefox. Vidalia will automatically clean up and exit. - -Changelog ---------- - -0.0.1: Initial revision (2007-12-11) -0.0.2: Update Vidalia to r2213 (2007-12-13) - Update Tor to 0.2.0.12-alpha - Add license files - Remove Portable Tor dependency - Add bookmarks to Tor, Torcheck and the hidden wiki -0.0.3: Move build infrastructure to GNU Make (2007-12-16) - Install Torbutton -0.0.4: Add internationalization for fa-IR and zh-CN - Add Makefile rule for installing Quick Locale Switcher, but - don't enable this by default -0.0.5: Disable FirefoxPortable splash screen (2007-12-24) - New prefs.js: - - Disable history storage - - Disable <a ping> handling - - Disable session storage (crash recovery) - - Disable logging of CSS errors - - Disable persistent cookies - - Disable IPv6 - - Disable external protocol handlers - - Disable failover to a secondary proxy - - Sanitize cookies and passwords on shutdown - - Prevent scripts calling plugins - - Empty add-on installation whitelist -0.0.6: Released 2008-01-29 - Rename start file "Start Tor Browser" so as to be easier to explain - Location of wget is now a configurable parameter - Vidalia updated to r2337 (for ProxyExecutable(Arguments) options - Tor updated to 0.2.0.18-alpha - Polipo 1.0.4 now included in bundle and Firefox configured - Firefox now configured to use proxies at 127.0.0.1 to prevent IPv6 attempt -0.0.7: Released 2008-02-08 - Security update of FirefoxPortable to v2.0.12 (see - http://www.mozilla.org/projects/security/known-vulnerabilities.html#Firefox) -0.0.8: Released 2008-02-15 - Security update of Torbutton to v1.1.13 (see - http://torbutton.torproject.org/dev/CHANGELOG) - Automate generation of internationalized bundles - Allow optional extensions to be placed in build-scripts/extensions - Build Polipo with regular expression support, activating forbiddenFile option - Update Polipo configuration based on Incognito suggestions -1.0.0: Released 2008-03-20 - Fix parse errors in polipo.conf (Phillip) - Move to HTTPS and specify language in homepage URL (check.torproject.org) - Update Vidalia license - Fix Makefile error when re-building the bundle - Update of Tor to 0.2.0.22-rc - Update of Torbutton to v1.1.17 (see - http://torbutton.torproject.org/dev/CHANGELOG) - Update of Vidalia to revision 2424 - Suppress warning on viewing an encrypted page -1.0.1: Released 2008-03-26 - Install .jar files placed in /extensions, as well as .xpi files - Update of Firefox to 2.0.0.13 to fix security problems (see - http://www.mozilla.org/projects/security/known-vulnerabilities.html#firefox…) - Update of Vidalia to revision 2464 - Update of Tor to 0.2.0.23-rc - Update prefs.js for new Torbutton defaults -1.0.2: Released 2008-05-03 - Update Vidalia to revision 2539 - Update Tor to 0.2.0.25-rc - Update FirefoxPortable to 2.0.0.14 - Update Torbutton to 1.1.18 - Add RunProxyAtStart to vidalia.conf (now required) -1.0.3: Released 2008-05-16 - Update Tor to 0.2.0.26-rc -1.1.0: Released 2008-06-13 - Replace startup batch script with application (RelativeLink), so there is a helpful icon - Make Qt 4.3.5 the default version - Optionally install Pidgin (for Tor IM Browser Bundle) - Extended INSTALL documentation - Optionally use WinRAR to produce a self-extracting split bundle - Update Vidalia to revision 2718 - Update Tor to 0.2.1.1-alpha - Update OpenSSL to 0.9.8h -1.1.1: Released 2008-07-20 - Update Vidalia to release 0.1.6 (we now longer need to track SVN trunk) - Update Pidgin Portable to 2.4.3 - Update Pidgin OTR plugin to 3.2 - Update Tor to 0.2.1.2-alpha - Update Torbutton to 1.2.0rc6 - Set TZ=UTC environment variable in RelativeLink (needed by Torbutton) -1.1.2: Released 2008-08-09 - Don't set TZ environment variable in RelativeLink (now done by Vidalia 0.1.7) - Update Vidalia to release 0.1.7 - Update Tor to 0.2.1.4-alpha - Update Firefox to 2.0.0.16 -1.1.3: Released 2008-08-22 - Fix homepage so that it is properly localized - Add &small=1 to homepage URL to request a more discreet page - Update Vidalia to release 0.1.8 -1.1.4: Released 2008-10-13 - Update Vidalia to release 0.1.9 - Update Tor to 0.2.1.6-alpha - Update Firefox to 2.0.0.16 - Update Pidgin to 2.5.1 -1.1.5: Released 2008-12-01 - Set AllowMultipleInstances=true, to allow Tor Browser Bundle and - Firefox to be run at the same time (suggested by John Brooks) - Update Vidalia to release 0.1.10 - Update Firefox to 2.0.0.18 - Update Tor to 0.2.1.7-alpha - Update Pidgin to 2.5.2 - Added a small patch and instructions to fix Qt compile time error - Corrected some minor mistakes in the INSTALL document - Updated INSTALL document to reflect updated build process -1.1.6: Released 2008-12-02 - Set AllowMultipleInstances=false, this isn't ready for primetime -1.1.7: Released 2008-12-12 - Update Tor to 0.2.1.8-alpha - Fix issue with OTR (The Pidgin wasn't in the right directory) - Update INSTALL document to reflect updated version numbers -1.1.8: Released 2009-01-22 - Update Tor to 0.2.1.11-alpha (security update) - Update OpenSSL to 0.9.8j (security update) - Update Firefox to 3.0.5 - Update Pidgin to 2.5.4 - Update libevent to 1.4.9 - -1.1.9: Released 2009-02-18 - Update Tor to 0.2.1.12-alpha - Update Firefox to 3.0.6 - Update Vidalia to 0.1.11 - -1.1.10: Released 2009-03-10 - Update Tor to 0.2.1.13-alpha - Update Firefox to 3.0.7 - Update Pidgin to 2.5.5 - -1.1.11: Released 2009-03-31 - Update Firefox to 3.0.8 - Add Italian language bundles - Update Torbutton to 1.2.1 - Update Vidalia to 0.1.12 - -1.1.12: Released 2009-04-12 - Update OpenSSL to 0.9.8k - Update Tor to 0.2.1.14-rc - -1.2.0: Released 2009-05-25 - Switch to launching Firefox directly from Vidalia to - allow multiple instances of Firefox - Update Firefox to 3.0.10 - Update to Qt 4.5.1 - Update Firefox prefs.js to stop scanning for plugins - Update libevent to 1.4.11 - Include the Tor geoip database - Update Vidalia to 0.1.13 - Update Tor to 0.2.1.15-rc - -1.2.1: Released 2009-06-21 - Better updates to Firefox to stop scanning for plugins on start - Update Pidgin to 2.5.6r2 - Update Firefox to 3.0.11 - Include OpenSSL 0.9.8k DLL and stop using the system ssl dll - Update Tor to 0.2.1.16-rc - -1.2.2: Released 2009-06-23 - Update Pidgin to 2.5.7 - -1.2.3: Released 2009-07-08 - Update Vidalia to 0.1.14 - Update Tor to 0.2.1.17-rc - Update Pidgin to 2.5.8 - -1.2.4: Released 2009-07-11 - Include libeay32.dll from OpenSSL 0.9.8k to make QT happy - Update Vidalia to 0.1.15 - -1.2.5: Released 2009-07-25 - update Tor to 0.2.1.18 - -1.2.6: Released 2009-07-28 - update Tor to 0.2.1.19 - -1.2.7: Released 2009-08-04 - update Firefox to 3.0.13 - add Polish translation - update libevent to 1.4.12 - -1.2.8: Released 2009-08-19 - update Torbutton to 1.2.2 - update Vidalia to 0.2.2 - compile OpenSSL 0.9.8k with Visual C to make dlls - update Pidgin to 2.6.1 - -1.2.9: Released 2009-09-11 - update Vidalia to 0.2.4 - update Qt to 4.5.2 - update Pidgin to 2.6.2 - update Firefox to 3.0.14 - -1.2.10: Released 2009-11-20 - update Vidalia to 0.2.6 - update Pidgin to 2.6.3 - update Tor to 0.2.1.20 - update Firefox to 3.0.15 - update OpenSSL to 0.9.8l - update libevent to 1.4.13 - -1.3.0: Released 2009-12:31 - upgrade Firefox to 3.5.6 - update Pidgin to 2.6.4 - update Torbutton to 1.2.4 - update Tor to 0.2.1.21 - -1.3.1: Released 2010-01-22 - update Firefox to 3.5.7 - update Pidgin to 2.6.5 - update Tor to 0.2.1.22 - -1.3.2: Released 2010-02-15 - update Vidalia to 0.2.7 - update Tor to 0.2.1.23 - update Qt to 4.6.2 - update Polipo to 1.4.0.1 - configure pidgin to not log chats by default - -1.3.3: Released 2010-02-27 - update Firefox to 3.5.8 - update Pidgin to 2.6.6 - update Tor to 0.2.1.24 - -1.3.4: Released 2010-04-04 - update Firefox to 3.5.9 - update Tor to 0.2.1.25 - -1.3.5: Released 2010-05-03 - add Vietnamese language - update Torbutton to 1.2.5 - update Tor to 0.2.1.26 - -1.3.6: Released 2010-05-26 - update Vidalia to 0.2.9 - -1.3.7: Released 2010-07-04 - update Pidgin to 2.7.1r2 - update Firefox to 3.5.10 - -1.3.8: Released 2010-07-22 - update Firefox to 3.5.11 - -1.3.9: Released 2010-07-22 - update Pidgin to 2.7.2 - -1.3.10: Released 2010-09-28 - update Vidalia to 0.2.10 - update Firefox to 3.6.10 - add new extensions: - Better Privacy 1.48.3 - NoScript 2.0.3.2 - HTTPS Everywhere 0.2.2 - -1.3.11: Released 2010-10-25 - update Firefox to 3.6.11 - update Pidgin to 2.7.4 - -1.3.12: Released 2010-10-28 - update Firefox to 3.6.12 - -1.3.13: Released 2010-11-25 - update Tor to 0.2.1.27 - update Pidgin to 2.7.5 - update OpenSSL to 0.9.8p - fix Firefox extension install path so extensions show in the installed add-ons list - disable Firefox's ability to search the Windows registry path for system-wide - plugins and extensions (closes: #2118) - remove NoScript and BetterPrivacy from stable bundle until they receive more - testing - -1.3.14: Released 2010-12-13 - update Firefox to 3.6.13 - update HTTPS-Everywhere to 0.9.9.development.1 - This version of HTTPS-Everywhere is patched to include a fix for bug #2096 which - prevented globally installed versions of the extensions from working. It also - includes better protection from Firesheep. See the changelog here: - https://www.eff.org/files/Changelog.txt - -1.3.15: Released 2010-12-17 - update Tor to 0.2.1.28 - update HTTPS-Everywhere to 0.9.9.development.2 - -1.3.16: Released 2010-01-09 - Update Firefox preferences to be more secure and disable geolocation to address #2338 diff --git a/README.Linux b/README.Linux deleted file mode 100644 index 6ce2244..0000000 --- a/README.Linux +++ /dev/null @@ -1,126 +0,0 @@ -Tor Browser Bundle for GNU/Linux -=============== - -Included applications ---------------------- - -Vidalia 0.2.11-svn (with Qt 4.7.1) -Tor 0.2.3.0-alpha-dev (with libevent-2.0.10, zlib-1.2.5 and openssl-1.0.0c) -Firefox 4.0b8 - \_ Torbutton 1.3.1-alpha - |_ HTTPS Everywhere 0.9.9.development.2 - -Usage ------ - -Extract the bundle with: - -tar -xvzf tor-browser-gnu-linux*.tar.gz - -This will create a directory named tor-browser_LANG. Click on this directory or -cd into it and execute the 'start-tor-browser' script. This will start Vidalia. -Once Tor has successfully opened a circuit, Firefox will automatically be -opened. - -To exit, close Firefox. Vidalia will automatically clean up and exit. - -Changelog ---------- - -x.x.x: NOT FOR PUBLIC RELEASE - THIS IS A TEST BUNDLE - -1.1.2: Released 2011-01-09 - Update Firefox preferences to be more secure and disable geolocation to address #2338 - -1.1.1: Released 2010-12-17 - Update Tor to 0.2.2.20-alpha - Update HTTPS Everywhere to 0.9.9.development.2 - -1.1.0: Released 2010-12-13 - Update Firefox to 3.6.13 - Update NoScript to 2.0.7 - Update HTTPS Everywhere to 0.9.9.development.1 - This version of HTTPS-Everywhere is patched to include a fix for bug #2096 which - prevented globally installed versions of the extension from working. It also - includes better protection from Firesheep. See the changelog here: - https://www.eff.org/files/Changelog.txt - Add Chris Davis's patch <https://bugzilla.mozilla.org/show_bug.cgi?id=280661> - This patch improves Firefox's SOCKS support and eliminates the need for Polipo, so - Torbutton has been reconfigured to just use a SOCKS proxy. Polipo has been removed - entirely from this release of the Tor Browser Bundle. If this causes you problems, - please file a bug: https://trac.torproject.org/projects/tor - Rebuild all binaries against glibc 2.7 so they work for older distros again - -1.0.17: Released 2010-11-24 - Update Tor to 0.2.2.19-alpha - -1.0.16: Released 2010-11-16 - Update Tor to 0.2.2.18-alpha - Update OpenSSL to 0.9.8p (see CVE-2010-3864) - Update NoScript to 2.0.5.1 - -1.0.15: Released 2010-10-28 - Update Firefox to 3.6.12 - -1.0.14: Released 2010-10-24 - Update Firefox to 3.6.11 - -1.0.13: Released 2010-10-01 - Update Tor to 0.2.2.17-alpha - Update Firefox to 3.6.10 - -1.0.12: Released 2010-09-18 - Update Tor to 0.2.2.16-alpha - -1.0.11: Released 2010-09-16 - Update Firefox to 3.6.9 - Update Vidalia to 0.2.10 - -1.0.10: Released 2010-08-20 - Update Tor to 0.2.2.15-alpha - Update Firefox to 3.6.8 - (Mozilla is not doing security and stability updates - for 3.5.x after August 2010) - Update NoScript to 2.0.2.3 - Update BetterPrivacy to 1.48.3 - Update HTTPS Everywhere to 0.2.2 - -1.0.9: Released 2010-07-13 - Update Tor to 0.2.2.14-alpha - -1.0.8: Released 2010-07-05 - Update libpng to 1.4.3 (see CVE-2010-1205) - Update Firefox to 3.5.10 - Update HTTPS Everywhere to 0.2.1 - -1.0.7: Released 2010-06-01 - Rebuild everything against an older glibc so it'll run on more distros - -1.0.6: Released 2010-05-31 - Add arch to tarball name so there's no collision - Add libpng for Arch Linux - Add HTTPS Everywhere extension - Update Qt to 4.6.2 - Update Vidalia to 0.2.9 - Update NoScript to 1.9.9.80 - -1.0.5: Released 2010-05-15 - Fix missing OpenSSL shared library bug - (thanks to bee at http://honeybeenet.altervista.org/homepage/) - -1.0.4: Released 2010-04-24 - Update Tor to 0.2.2.13-alpha - -1.0.3: Released 2010-04-20 - Update Tor to 0.2.2.12-alpha - -1.0.2: Released 2010-04-18 - Update Tor to 0.2.2.10-alpha - Update to Vidalia 0.2.8 - -1.0.1: Released 2010-04-08 - Stop TBB from crashing when it tries to download files - Update Torbutton to 1.2.5 - -1.0.0: Initial release (2010-03-25) diff --git a/README.OSX b/README.OSX deleted file mode 100644 index 6116672..0000000 --- a/README.OSX +++ /dev/null @@ -1,73 +0,0 @@ -Tor Browser Bundle for Mac OS X -=============== - -Included applications ---------------------- - -Vidalia 0.2.10 (with Qt 4.6.2) -Tor 0.2.2.22-alpha (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0c) -Firefox (Namoroka) 3.6.13 - \_ Torbutton 1.2.5 - |_ NoScript 2.0.9.3 - |_ HTTPS-Everywhere 0.9.9.development.2 - |_ BetterPrivacy 1.48.3 - -Usage ------ - -Unzip the TorBrowser zip file that you downloaded. Click on the -TorBrowser_LANG.app inside will launch Vidalia and then Firefox. - -To exit, close Firefox and Vidalia. - -Changelog ---------- - -1.2.0-libevent2: TESTING RELEASE: Released 2011-02-03 - Test Tor Browser Bundle - Update Libevent to 2.0.10-stable - Update OpenSSL to 1.0.0c - Update zlib to 1.2.5 - Remove polipo - This bundle will not work with OS X 10.4 - -1.0.9: Released 2011-01-09 - Update Firefox preferences to be more secure and disable geolocation to address #2338 - -1.0.8: Released 2010-12-17 - Update Tor to 0.2.2.20-alpha - Update HTTPS-Everywhere to 0.9.9.development.2 - -1.0.7: Released 2010-12-14 - Update Firefox to 3.6.13 - Update NoScript to 2.0.7 - Update HTTPS-Everywhere to 0.9.9.development.1 - This version of HTTPS-Everywhere is patched to include a fix for bug #2096 which - prevented globally installed versions of the extension from working. It also - includes better protection from Firesheep. See the changelog here: - https://www.eff.org/files/Changelog.txt - -1.0.6: Released 2010-11-24 - Update Tor to 0.2.2.19-alpha - -1.0.5: Released 2010-11-18 - Update Tor to 0.2.2.18-alpha - Update OpenSSL to 0.9.8p (see CVE-2010-3864) - Update NoScript to 2.0.5.1 - -1.0.4: Released 2010-10-28 - Update Firefox to 3.6.12 - Fix weird Torbutton location so users can tell it's installed - -1.0.3: Released 2010-10-25 - Update Firefox to 3.6.11 - -1.0.2: Released 2010-10-01 - Update Tor to 0.2.2.17-alpha - Update Firefox to 3.6.10 - Add BetterPrivacy 1.48.3 - -1.0.1: Released 2010-09-18 - Update Tor to 0.2.2.16-alpha - -1.0.0: Initial release (2010-09-15) diff --git a/build-scripts/Makefile b/build-scripts/Makefile deleted file mode 100644 index 82abf89..0000000 --- a/build-scripts/Makefile +++ /dev/null @@ -1,346 +0,0 @@ -### -### Makefile for building Tor USB bundle -### -### Copyright 2007 Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> -### See LICENSE for licensing information -### -### $Id$ -### - -##################### -### Configuration ### -##################### - -## Location of required libraries -MING=/c/c/mingw/bin -QT=/c/Qt/4.6.2/bin -OPENSSL=/e/build/openssl-0.9.8p/ - -## Versions -TORBUTTON_VERSION=1.2.5 -FIREFOX_VERSION=3.6.13 -PIDGIN_VERSION=2.7.5 - -## Location of bundle components -VIDALIA=/e/build/vidalia-0.2.10 -TOR=/e/build/tor-0.2.1.28 -POLIPO=/e/build/polipo-1.0.4.1 -FIREFOX_SRC=/e/build/FirefoxPortable-3.6.13 -PIDGIN_SRC=/e/build/PidginPortable-2.7.5 - -## Location of utility applications -PWD:=$(shell pwd) -PYTHON=/c/Python25/python.exe -SEVENZIP="/c/Program Files/7-Zip/7z.exe" -WGET=$(PYTHON) $(PWD)/pyget.py -VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py -WINRAR="/c/Program Files/WinRAR/WinRAR.exe" - -## Size of split archive volumes for WinRAR -SPLITSIZE=1440k - -## Location of config files -CONFIG_SRC=config - -## Destination for the generic bundle -DEST="Generic Bundle" - -## Name of the bundle" -NAME="Tor Browser" - -## Version and name of the compressed bundle (also used for source) -VERSION=1.3.16 -DEFAULT_COMPRESSED_BASENAME=tor-browser- -IM_COMPRESSED_BASENAME=tor-im-browser- -DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION) -IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) - -ifeq ($(USE_PIDGIN),1) -COMPRESSED_NAME=$(IM_COMPRESSED_NAME) -else -COMPRESSED_NAME=$(DEFAULT_COMPRESSED_NAME) -endif - -## Extensions to install by default -DEFAULT_EXTENSIONS=torbutton.xpi - -## Where to download Torbutton from -#TORBUTTON=https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail -TORBUTTON=https://www.torproject.org/torbutton/releases/torbutton-$(TORBUTTON_VERSION).xpi - -## Where to download Mozilla language packs -MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VERSION)/win32/xpi - -## Where Farsi Language Pack can be downloaded from -#FA_LANGPACK=https://addons.mozilla.org/en-US/firefox/downloads/latest/3667/addon-3667-latest.xpi - -## Put more extensions here -EXTENSIONS_DIR=extensions - -## Local overrides --include local.makefile - -############# -### Rules ### -############# - -## -## Default rule -## - -bundle: bundle_en-US - -all-bundles-both: - USE_PIDGIN=1 make all-bundles - make clean - USE_PIDGIN=0 make all-bundles - make clean - -all-bundles: all-compressed-bundles all-split-bundles - -all-compressed-bundles: compressed-bundle_ar \ - compressed-bundle_en-US \ - compressed-bundle_de \ - compressed-bundle_es-ES \ - compressed-bundle_fa \ - compressed-bundle_fr \ - compressed-bundle_nl \ - compressed-bundle_pl \ - compressed-bundle_pt-PT \ - compressed-bundle_ru \ - compressed-bundle_zh-CN \ - compressed-bundle_it \ - compressed-bundle_vi - -all-split-bundles: split-bundle_ar \ - split-bundle_en-US \ - split-bundle_de \ - split-bundle_es-ES \ - split-bundle_fa \ - split-bundle_fr \ - split-bundle_nl \ - split-bundle_pl \ - split-bundle_pt-PT \ - split-bundle_ru \ - split-bundle_zh-CN \ - split-bundle_it \ - split-bundle_vi - -## -## Cleanup -## - -clean: - rm -fr $(DEST) *.stamp - rm -f *~ - rm -fr *.xpi *.jar - rm -fr $(NAME)_* - cd ../src/RelativeLink/ && $(MAKE) clean - -## Also remove the output files -reallyclean: clean - rm -fr $(IM_COMPRESSED_BASENAME)*_*.exe - rm -fr $(IM_COMPRESSED_BASENAME)*_*.rar - rm -fr $(IM_COMPRESSED_BASENAME)*_*_split - rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*.exe - rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*.rar - rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*_split - -## -## Scan .exe files against VirusTotal to check for false positives -## - -virus-scan: - $(VIRUSSCAN) $(VIDALIA)/build/src/vidalia/vidalia.exe - $(VIRUSSCAN) $(POLIPO)/polipo.exe - $(VIRUSSCAN) $(TOR)/src/or/tor.exe - $(VIRUSSCAN) $(TOR)/src/tools/tor-resolve.exe - -## -## Generate a non-localized bundle and put in $(DEST) -## - -## Install binaries, documentation, FirefoxPortable, PidginPortable, and launcher into $(DEST) -generic-bundle.stamp: - make generic-bundle -generic-bundle: directory-structure install-binaries install-docs install-firefoxportable install-pidginportable configure-apps launcher - touch generic-bundle.stamp - -APPDIR=$(DEST)/App -DOCSDIR=$(DEST)/Docs -DATADIR=$(DEST)/Data - -## Build directory structure -directory-structure: - rm -fr $(DEST) - mkdir -p $(APPDIR) - mkdir -p $(DATADIR)/Tor - mkdir -p $(DATADIR)/Vidalia - mkdir -p $(DATADIR)/Polipo - mkdir -p $(DOCSDIR) - -## Package up all the Vidalia and Tor pre-requisites -## Filenames extracted using Dependency Walker <http://www.dependencywalker.com/> -install-binaries: - cp $(MING)/mingwm10.dll $(APPDIR) - cp $(MING)/libgnurx-0.dll $(APPDIR) - cp $(QT)/QtCore4.dll $(QT)/QtGui4.dll $(QT)/QtNetwork4.dll $(QT)/QtXml4.dll $(QT)/libgcc_s_dw2-1.dll $(APPDIR) - cp $(OPENSSL)/ssleay32.dll $(APPDIR) - cp $(OPENSSL)/libeay32.dll $(APPDIR) - cp $(VIDALIA)/build/src/vidalia/vidalia.exe $(APPDIR) - cp $(POLIPO)/polipo.exe $(APPDIR) - cp $(TOR)/src/or/tor.exe $(TOR)/src/tools/tor-resolve.exe $(APPDIR) - -## Collect up license files -install-docs: - mkdir -p $(DOCSDIR)/Vidalia - mkdir -p $(DOCSDIR)/Tor - mkdir -p $(DOCSDIR)/Qt - mkdir -p $(DOCSDIR)/MinGW - mkdir -p $(DOCSDIR)/Polipo - cp $(VIDALIA)/LICENSE* $(VIDALIA)/CREDITS $(DOCSDIR)/Vidalia - cp $(TOR)/LICENSE $(TOR)/AUTHORS $(TOR)/README $(DOCSDIR)/Tor - cp $(QT)/../LICENSE.GPL* $(QT)/../LICENSE.LGPL $(DOCSDIR)/Qt - cp $(MING)/../COPYING $(DOCSDIR)/MinGW - cp $(POLIPO)/COPYING $(POLIPO)/README.Windows $(DOCSDIR)/Polipo - cp ../README $(DOCSDIR)/README-TorBrowserBundle - -## Copy over FirefoxPortable -install-firefoxportable: - cp -R $(FIREFOX_SRC) $(DEST)/FirefoxPortable - -## Copy over PidginPortable -install-pidginportable: -ifeq ($(USE_PIDGIN),1) - cp -R $(PIDGIN_SRC) $(DEST)/PidginPortable -endif - -## Configure Firefox, FirefoxPortable, Vidalia, Polipo and Tor -configure-apps: - ## Configure Firefox preferences - cp $(CONFIG_SRC)/prefs.js $(DEST)/FirefoxPortable/App/DefaultData/profile/ - cp $(CONFIG_SRC)/bookmarks.html $(DEST)/FirefoxPortable/App/DefaultData/profile/ - ## Set up alternate launcher - mv $(DEST)/FirefoxPortable/App/Firefox/firefox.exe $(DEST)/FirefoxPortable/App/Firefox/tbb-firefox.exe - #rm $(DEST)/FirefoxPortable/FirefoxPortable.exe - ## Configure FirefoxPortable - cp $(CONFIG_SRC)/FirefoxPortable.ini $(DEST)/FirefoxPortable - cp $(CONFIG_SRC)/FirefoxPortableSettings.ini $(DEST)/FirefoxPortable/Data/settings - ## Configure PidginPortable -ifeq ($(USE_PIDGIN),1) - cp $(CONFIG_SRC)/PidginPortable.ini $(DEST)/PidginPortable - mkdir -p $(DEST)/PidginPortable/Data/settings/.purple - cp $(CONFIG_SRC)/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple - cp $(CONFIG_SRC)/PidginPortableSettings.ini $(DEST)/PidginPortable/Data/settings -endif - ## Configure Vidalia -ifeq ($(USE_PIDGIN),1) - cp $(CONFIG_SRC)/vidalia.conf.ff+pidgin $(DEST)/Data/Vidalia/vidalia.conf -else - cp $(CONFIG_SRC)/vidalia.conf.ff $(DEST)/Data/Vidalia/vidalia.conf -endif - ## Configure Polipo - cp $(CONFIG_SRC)/polipo.conf $(DEST)/Data/Polipo - ## Configure Tor - cp $(CONFIG_SRC)/torrc $(DEST)/Data/Tor - cp $(TOR)/src/config/geoip $(DEST)/Data/Tor - -launcher: - #echo 'start /b .\\App\\vidalia.exe --datadir .\\Data\\Vidalia\\' > $(DEST)/"Start Tor Browser.bat" - cd ../src/RelativeLink/ && $(MAKE) - cp ../src/RelativeLink/StartTorBrowserBundle.exe $(DEST)/"Start Tor Browser.exe" - -## -## How to create required extensions -## - -## Torbutton development version -torbutton.xpi: - $(WGET) -O $@ $(TORBUTTON) - -## Generic language pack rule -langpack_%.xpi: - $(WGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi -## English comes as default -langpack_en-US.xpi: - touch $@ - -## -## Customize the bundle -## - -bundle_%: - LANGCODE=$* make bundle-localized -compressed-bundle_%: - LANGCODE=$* make compressed-bundle-localized -split-bundle_%: - LANGCODE=$* make split-bundle-localized - -bundle-localized_%.stamp: - make copy-files_$* install-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language - touch bundle-localized_$*.stamp - -bundle-localized: bundle-localized_$(LANGCODE).stamp - -compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp - rm -f $(COMPRESSED_NAME)_$(LANGCODE).exe - cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -mx9 -sfx7z.sfx ../$(COMPRESSED_NAME)_$(LANGCODE).exe $(NAME) - -split-bundle-localized: bundle-localized_$(LANGCODE).stamp - rm -fr $(COMPRESSED_NAME)_$(LANGCODE)_split; mkdir $(COMPRESSED_NAME)_$(LANGCODE)_split - cd $(NAME)_$(LANGCODE); $(WINRAR) a -r -s -ibck -sfx -v$(SPLITSIZE) \ - ../$(COMPRESSED_NAME)_$(LANGCODE)_split/$(COMPRESSED_NAME)_$(LANGCODE)_split.exe $(NAME) - -copy-files_%: generic-bundle.stamp - rm -fr $(NAME)_$* - mkdir $(NAME)_$* - cp -R $(DEST) $(NAME)_$*/$(NAME) - -BUNDLE=$(NAME)_$(LANGCODE)/$(NAME) -DUMMYPROFILE=$(BUNDLE)/FirefoxPortable/App/DummyProfile -install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) - ## Make a dummy profile to stop Firefox creating some large files - cp -R $(BUNDLE)/FirefoxPortable/App/DefaultData $(DUMMYPROFILE) -ifneq ($(LANGCODE), en-US) - mv langpack_$(LANGCODE).xpi $(BUNDLE)/FirefoxPortable/App/Firefox/extensions/langpack-$(LANGCODE)\(a)firefox.mozilla.org.zip - $(SEVENZIP) x -o$(BUNDLE)/FirefoxPortable/App/Firefox/extensions/langpack-$(LANGCODE)\(a)firefox.mozilla.org $(BUNDLE)/FirefoxPortable/App/Firefox/extensions/langpack-$(LANGCODE)\(a)firefox.mozilla.org.zip -endif - rm -fr $(DUMMYPROFILE) - -## Set the language for Vidalia -patch-vidalia-language: - ## Patch Vidalia - ./patch-vidalia-language.sh $(BUNDLE)/Data/Vidalia/vidalia.conf $(LANGCODE) - -## Set the language for Pidgin -patch-pidgin-language: - ## Patch Pidgin -ifeq ($(USE_PIDGIN),1) - ./patch-pidgin-language.sh $(BUNDLE)/PidginPortable/Data/settings/PidginPortableSettings.ini $(LANGCODE) \ - $(BUNDLE)/PidginPortable/App/Pidgin/locale \ - $(BUNDLE)/PidginPortable/App/Pidgin/Gtk/share/locale -endif - -patch-firefox-language: - ## Patch Firefox prefs.js - ./patch-firefox-language.sh $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js $(LANGCODE) - -### -### Utilities -### - -## Copy Firefox preferences from a run of FirefoxPortable to be the default -apply-prefs: - cp $(DEST)/FirefoxPortable/Data/profile/prefs.js $(CONFIG_SRC) - -## Export the source code of the bundle -SRCNAME=$(COMPRESSED_NAME) -SRCDEST=/tmp -SRCDESTPATH=$(SRCDEST)/$(SRCNAME) -srcdist: - rm -fr $(SRCDESTPATH) - git clone git://git.torproject.org/torbrowser.git \ - $(SRCDESTPATH) - cd $(SRCDEST); tar --exclude src/archived-patches \ - --exclude src/current-patches --exclude src/processtest \ - --exclude .git -czvf $(SRCNAME)-src.tar.gz $(SRCNAME)

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 25 Oct '11

25 Oct '11

commit b4a54a4017c85988cc33b7dc990a5eeabf57490d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 25 14:16:17 2011 +0000 Update translations for tsum --- pt/tsum.po | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pt/tsum.po b/pt/tsum.po index 7cdc6e7..030e67b 100644 --- a/pt/tsum.po +++ b/pt/tsum.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-10-17 13:23+0200\n" -"PO-Revision-Date: 2011-10-17 12:25+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2011-10-25 13:55+0000\n" +"Last-Translator: donthatekyle <caiocajazeiras12(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -345,6 +345,12 @@ msgid "" "want to make sure that the version number on the top line of the changelog " "file matches the version number in the filename." msgstr "" +"Uma vez que você tenha verificado a assinatura e viu a saída *\"Good " +"signature\"*, vá em frene e extraia o arquivo package. Você deve ver um " +"diretório similiar a **tor-browser_en-US**. Dentro do diretório está outro " +"diretório chamado **Docs**, que contém um arquivo chamado **changelog**. " +"Você quer ter certeza de que a versão no topo do arquivo changelog " +"corresponde ao número da versão no arquivo." #. type: Plain text #: tsum.text:139 @@ -354,6 +360,10 @@ msgid "" "files in it. One of the files is an executable called \"Start Tor Browser\" " "(or \"start-tor-browser\", depending on your operating system)." msgstr "" +"### Como usar o Pacote de Navegação do Tor: Depois de baixar o Pacote de " +"Navegação do Tor e extrair o package, você deve ter um diretório com alguns " +"arquivos nele. Um dos arquivos é um executável chamado \"Start Tor Browser\"" +" (ou \"start-tor-browser\", dependendo do seu sistema operacional)." #. type: Plain text #: tsum.text:146

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 25 Oct '11

25 Oct '11

commit b8158e76fdcc79d247dd34c8a2a82fe6fcfd69aa Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 25 11:15:45 2011 +0000 Update translations for tsum --- fr/tsum.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fr/tsum.po b/fr/tsum.po index 1669971..28395b4 100644 --- a/fr/tsum.po +++ b/fr/tsum.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-10-17 13:23+0200\n" -"PO-Revision-Date: 2011-10-25 10:44+0000\n" +"PO-Revision-Date: 2011-10-25 10:48+0000\n" "Last-Translator: arpalord <arpalord(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -496,8 +496,9 @@ msgid "" "anti-virus program is not preventing Tor from making network\n" "connections.\n" msgstr "" -"**Votre antivirus bloque Tor**: Assurez-vous que votre programme antivirus " -"n’empêche pas les connexions au réseau Tor.\n" +"**Votre antivirus bloque Tor**: Assurez-vous que votre \n" +"programme antivirus n’empêche pas les connexions au réseau \n" +"Tor.\n" #. type: Plain text #: tsum.text:177

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 25 Oct '11

25 Oct '11

commit 58b5f8b2357603771994e9e7d9b0d46d749a740e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 25 10:45:44 2011 +0000 Update translations for tsum --- fr/tsum.po | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/fr/tsum.po b/fr/tsum.po index 1a01864..1669971 100644 --- a/fr/tsum.po +++ b/fr/tsum.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# arpalord <arpalord(a)gmail.com>, 2011. # <dumdumwhawha(a)gmail.com>, 2011. # <erwan.guillon(a)gmail.com>, 2011. # <frenchy_reboss(a)hotmail.com>, 2011. @@ -16,8 +17,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-10-17 13:23+0200\n" -"PO-Revision-Date: 2011-10-18 09:18+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2011-10-25 10:44+0000\n" +"Last-Translator: arpalord <arpalord(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -362,6 +363,8 @@ msgid "" "\tgpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-" "US.exe\n" msgstr "" +"gpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-" +"US.exe\n" #. type: Plain text #: tsum.text:126 @@ -493,6 +496,8 @@ msgid "" "anti-virus program is not preventing Tor from making network\n" "connections.\n" msgstr "" +"**Votre antivirus bloque Tor**: Assurez-vous que votre programme antivirus " +"n’empêche pas les connexions au réseau Tor.\n" #. type: Plain text #: tsum.text:177

1 0

[torsocks/master] Bump the version to 2.1 in preparation for release
by hoganrobert＠torproject.org 24 Oct '11

24 Oct '11

commit 9476ecffdc93294c744999f5a7504b965133ea7a Author: Robert Hogan <robert(a)roberthogan.net> Date: Mon Oct 24 20:31:01 2011 +0100 Bump the version to 2.1 in preparation for release --- configure.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index bb98460..36e3ed8 100644 --- a/configure.in +++ b/configure.in @@ -9,7 +9,7 @@ AC_INIT() AC_CONFIG_HEADER(config.h) # Automake initialization -AM_INIT_AUTOMAKE(torsocks, 0.1) +AM_INIT_AUTOMAKE(torsocks, 1.2) # Get hostname and other information. AC_CANONICAL_HOST

1 0

[torsocks/master] Issue 27: Fix build system so 'make dist' works
by hoganrobert＠torproject.org 24 Oct '11

24 Oct '11

commit c9448f11280deade8fb2ae66ce10678dfa756144 Author: Robert Hogan <robert(a)roberthogan.net> Date: Mon Oct 24 20:27:23 2011 +0100 Issue 27: Fix build system so 'make dist' works "The current build system fails when trying to create a tarball using 'make dist'. There are two problems here: When creating a tarball for distribution with 'make dist', the header files at src/*.h are not included and so the build fails. These should be listed in libtorsocks_la_SOURCES. Similarly, not having the prefix dist_ for the installation directories in doc/ means that these will not be included in the distribution tarball. Also, there is no need to define custom *manpagedirs as the build system is man page aware." Patch by Anthony Basile <blueness(a)gentoo.org> --- doc/Makefile.am | 16 +++------------- src/Makefile.am | 3 ++- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index ed6cbf4..222ba92 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,18 +1,8 @@ # Makefile used by configure to create real Makefile # Install configuration file -usewithtorconfdir = $(CONFDIR)/ -usewithtorconf_DATA = torsocks.conf +confdir = $(CONFDIR)/ +dist_conf_DATA = torsocks.conf # Install man pages -torsocksmanpagedir = $(mandir)/man1 -torsocksmanpage_DATA = torsocks.1 - -torsocks8manpagedir = $(mandir)/man8 -torsocks8manpage_DATA = torsocks.8 - -usewithtormanpagedir = $(mandir)/man1 -usewithtormanpage_DATA = usewithtor.1 - -torsocksconfmanpagedir = $(mandir)/man5 -torsocksconfmanpage_DATA = torsocks.conf.5 +dist_man_MANS = torsocks.1 torsocks.8 usewithtor.1 torsocks.conf.5 diff --git a/src/Makefile.am b/src/Makefile.am index 5f13f47..e3a01c9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,7 +9,8 @@ INSTALL_SCRIPT = $(install_sh) -c -m 755 libtorsocks_la_LDFLAGS= $(TORSOCKSLDFLAGS) # Install main library to $(prefix)/lib/tor (must match torsocks.in) lib_LTLIBRARIES = libtorsocks.la -libtorsocks_la_SOURCES = torsocks.c common.c parser.c dead_pool.c darwin_warts.c socks.c +libtorsocks_la_SOURCES = torsocks.c common.c parser.c dead_pool.c darwin_warts.c socks.c\ + common.h dead_pool.h expansion_table.h parser.h socks.h DISTCLEANFILES=parser.lo dead_pool.lo common.lo libtorsocks.lo torsocks.lo darwin_warts.lo socks.lo\ config.cache config.log config.h Makefile \

1 0

[torsocks/master] Issue 29: tordns no worky? - Part 2
by hoganrobert＠torproject.org 24 Oct '11

24 Oct '11

commit 3d8c166b19c1150c5c0b69bf567f1c771f766957 Author: Robert Hogan <robert(a)roberthogan.net> Date: Mon Oct 24 19:44:11 2011 +0100 Issue 29: tordns no worky? - Part 2 This was a regression caused by splitting tsocks.c into socks.c and torsocks.c. The 'requests' variable was declared static in the socks.h header file with the result that the value was no longer shared between source files. Define 'requests' in socks.c and declare it extern in socks.h. Patch from foobi..(a)gmail.com --- src/socks.c | 1 + src/socks.h | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/socks.c b/src/socks.c index 41c19a9..8497728 100644 --- a/src/socks.c +++ b/src/socks.c @@ -84,6 +84,7 @@ static int send_socksv4a_request(struct connreq *conn, const char *onion_host); dead_pool *pool = NULL; +struct connreq *requests = NULL; struct connreq *new_socks_request(int sockid, struct sockaddr_in *connaddr, struct sockaddr_in *serveraddr, diff --git a/src/socks.h b/src/socks.h index 3a4b0cd..6dd497f 100644 --- a/src/socks.h +++ b/src/socks.h @@ -104,7 +104,7 @@ struct connreq { /* Global Declarations */ extern dead_pool *pool; -static struct connreq *requests = NULL; +extern struct connreq *requests; struct connreq *new_socks_request(int sockid, struct sockaddr_in *connaddr, struct sockaddr_in *serveraddr,

1 0