[tor-commits] [torbrowser/maint-2.3] Remove some old leftovers

erinn at torproject.org erinn at torproject.org
Thu Mar 8 20:43:01 UTC 2012


commit 949b6820a0c24cac296a0127251840afb043f4b4
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Thu Feb 2 18:46:04 2012 +0100

    Remove some old leftovers
---
 README.dev             |   33 -----------------
 docs/ToaST-startup.txt |   90 ------------------------------------------------
 docs/rationale.txt     |   56 ------------------------------
 docs/torusb-notes.txt  |   82 -------------------------------------------
 docs/two-firefox.txt   |   72 --------------------------------------
 5 files changed, 0 insertions(+), 333 deletions(-)

diff --git a/README.dev b/README.dev
deleted file mode 100644
index 6113822..0000000
--- a/README.dev
+++ /dev/null
@@ -1,33 +0,0 @@
-Tor USB project
-===============
-
-Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/>
-
-Contents
---------
-
-build-scripts: Code for building and customizing a Tor USB bundle
-  \___ INSTALL: Installation instructions
-  |___ config/: Configuration files for bundle components
-
-docs: Documentation for project
-  \___ ToaST-startup: Rough description of ToaST startup procedure
-  |___ rationale.txt: Reasoning behind bundle design decisions
-  |___ torusb-notes.txt: Experiences from running various other Tor
-                         USB bundles
-
-src: Source code
-  \___ processtest: Qt project for starting Firefox and detecting
-  |                 termination behaviour (see included README for
-  |                 build instructions)
-  |___ current-patches: Patches to other applications currently in
-                        testing
-
-Status
-------
-
-Using build-scripts/Makefile it is possible to create a working USB
-Tor bundle. It's limitations include:
- - It uses the FirefoxPortable binaries
-
-Further issues are discussed in TODO.
diff --git a/docs/ToaST-startup.txt b/docs/ToaST-startup.txt
deleted file mode 100644
index 9921746..0000000
--- a/docs/ToaST-startup.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-###
-### Rough description of ToaST startup procedure
-### Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/>
-###
-### $Id$
-###
-
-Create TorparkMutex
-if <ToaST already running>
- if <User requests ToST should exit>
-  UnloadTorParkandFirefox()
-
-If PreserveTorCacheMode switch:
- PreserveTorCache = 1
-If DebugMode:
- DeugOn = 1
-If DebugModeSilent
- DebugOn =
-If DebugModeSilent
- DebugOn = 2
-
-Load INI file
-
-If cannot find Firefox:
- UnloadTorpark
- exit
-
-If Firefox.exe running
- If User requests to kill Firefox:
-   Kill Firefox.exe
- else
-   UnloadTorpark
-   exit
-
-If ! profiledir\prefs.js exists:
- Copy/Create profile
-
-If profile directory not writable:
- UnloadTorpark
- exit
-
-Ask if user wants to exit:
- UnloadTorparkAndFirefox
- exit
-
-Patch chrome\chrome.rdf (jar:/// and file:///)
-
-Patch Calendar\CalendarManager.rdf (NC:path)
-
-Patch prefs.js (add user_pref("browser.shall.checkDefaultBrowser",
-false))
-
-Delete compreg.dat
-
-If ALLOWMULTIPLEINSTANCES, set environment variable "MOZ_NO_REMOTE"
-
-SET MOZ_PLUGINPATH=PLUGINSDIRECTORY
-SET USERPROFILE=USERPROFILEDIRECTORY
-
-Repeatedly call "CheckForBadFirefox"
-
-Start progress bar
-
-While Tor not running:
- If not bootstrapping, remove Tor\Data
- 
-While 1:
- If user clicks cancel, exit
-
- If Tor is dead, restart it
-
- Wait for a Tor event or timeout
-
- If event is an error:
-  Show error message
- If event is a timeout:
-  Show a message, ask if can continue
- else:
-  break
-
-Start Polipo
-Start Firefox
-Wait until Firefox has started
-
-Wait for Firefox to exit
-
-Kill Polipo and Tor
-
-function CheckForBadFirefox():
- If Firefox is running, show a error and kill Firefox
diff --git a/docs/rationale.txt b/docs/rationale.txt
deleted file mode 100644
index bf193cb..0000000
--- a/docs/rationale.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-###
-### Rationale for Tor Browser Bundle configuration choices
-###
-### Copyright 2007 Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/>
-### See LICENSE for licensing information
-###
-### $Id$
-###
-
-Altering FirefoxPortable
-------------------------
-
-The .ini file needs to have "WaitForFirefox=true" set, since otherwise
-the launcher will exit immediately after starting Firefox. Currently
-we rely on detecting Firefox closing for when to shut down Tor.
-
-Design suggestions from IBB
----------------------------
-
-- Is looking like IE (as ToaST does) good for security
-
-  IBB's answer: browser frames are small and subtle compared to
-  the page that's actually being displayed. They'll ask some people,
-  but until they say to worry about it, don't worry about it.
-
-- Is having a splash screen likely to attract unwanted attention
-
-  IBB's answer: Yes; don't do that. Even the Vidalia control panel
-  will become recognizable over time. We should help users learn that
-  they can hide it on subsequent runs. Hopefully the onion in the
-  system tray will be both a) adequate for knowing Tor's status, and
-  b) not very recognizable.
-
-  [SJM - OK, I've disabled the splash screen. There is now a few
-   second pause between the green onion and the browser window.
-   Hopefully this will be OK.]
-
-- How big can USB Tor be on disk/when downloaded
-
-  IBB's answer: 128 meg usb keys are the default these days. So a 
-  20-30 meg download is fine. More than that is bad.
-
-  [SJM - Currently we are at a 12 MB download and it's 48 MB on disk]
-
-- Should we cache directory information on the USB device/hard disk
-
-  IBB's answer: if Tor's already on the media, then putting more stuff
-  there isn't a problem. But don't put it on the hard drive if Tor is
-  on the USB key. Roger told them it would be a big win for startup
-  time.
-
-- How much of a worry is wearing out the flash
-
-  IBB's answer: don't worry about it. We should continue to improve
-  features like Tor's AvoidDiskWrites if there turns out to be an
-  issue either with read/write speed or with wearing out.
diff --git a/docs/torusb-notes.txt b/docs/torusb-notes.txt
deleted file mode 100644
index b7d1087..0000000
--- a/docs/torusb-notes.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-Notes from trying out a few USB Tor bundles
-===========================================
-
-Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/>
-
-xB-Browser_2.0.0.6a.exe
------------------------
-
-8.8 MB download (.exe)
-32.5 MB install
-
-Splash screen on startup
-30 sec until Firefox
-
-Firefox extensions:
- Adblock Plus 0.7.5.1
- ChatZilla 0.9.78.1
- ErrorZilla Mod 0.2
- Flush Tor Circuit 0.3
- NoScript 1.1.6.02
- PrefBar 3.4.0
- Quick Locale Switcher 1.6.2
- Torbutton 1.0.4
-
-Google is default homepage
-Google search with suggestion is on
-
-IRC autoconnects to ircs://irc.metropipe.net with user "xerobank user"
-Cannot make it connect to another network without "/server"
-
-Adblock auto-downloads filtersets unencrypted (over Tor)
-
-Noscript has no whitelist for JS, but does for XSS
-
-ToaST
------
-
-14.6 MB download (.zip)
-39.6 MB install
-
-Lots of files to click on, not sure which
-
-Shows warning
-Splash screen
-Progress Bar
-Uses Firefox, configured to look like IE, and defaults to Torcheck
-
-Firefox extensions:
- Firesomething 1.8.0
- Quick Locale Switcher 1.6.3.4
- Restart Firefox 0.3
- Torbutton 1.1.7-alpha
- Window Styles 0.8.5
- 
-Portable firefox
-----------------
-
-6.12 MB download (.exe)
-10.9 MB install
-
-Just runs Privoxy and Vidalia
-
-Opera Tor
----------
-
-6.4 MB download (.zip)
-12.9 MB install
-
-No progress bar, but it works
-
-Democrakey
------------
-65.5MB download
-145 MB install
-
-Starts up with unusual looking window
-
-ClamAV, Thunderbid and Democrapark
-Shows a warning
-Displays a fake progress bar
-Failed, and showed a dialog box
-Opened an non-Tor Firefox
diff --git a/docs/two-firefox.txt b/docs/two-firefox.txt
deleted file mode 100644
index fce179e..0000000
--- a/docs/two-firefox.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-###
-### Notes on problems running two Firefox instances in parallel
-###
-### Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/>
-###
-### $Id$
-###
-
-Introduction
-============
-
-It sometimes might be desirable to have multiple instances of Tor
-running simultaneously, for example using one for normal web browsing
-and one for Tor.
-
-Firefox does not support this very well, under Windows, and therefore
-FirefoxPortable will by default prevent multiple instances of Firefox.
-
-There are two scenarios in which multiple instances of Firefox will
-run: Tor Browser starting first and Tor Browser starting second. Since
-we only have control of the Tor Browser configuration, the two
-scenarios are difference.
-
-Tor Browser starting first
-==========================
-
-If Firefox is not running when Tor Browser is started, FirefoxPortable
-will launch Firefox as normal.
-
-When the second Firefox is launched, it will search for existing
-Firefox windows:
- http://lxr.mozilla.org/mozilla1.8.0/source/xpfe/bootstrap/nsNativeAppSupportWin.cpp#1060
-
-If an existing instance is found, Firefox will open a new Window, so
-the end result is two Torifed Firefox windows.
-
-Tor Browser starting second
-===========================
-
-If Firefox is already running when Tor Browser is launched,
-FirefoxPortable will abort the startup unless the
-AllowMultipleInstances FirefoxPortable option is set.
-
-In that case, the MOZ_NO_REMOTE environment variable will be set,
-which will cause Firefox not to search for existing Firefox windows,
-and so launch a separate instance.
-
-MOZ_NO_REMOTE appears to also disable the creation of a messaging
-window, so will also handle the case of Tor Browser starting first. If
-this is not the case, an extension to the Torbutton addon can have the
-same effect.
-
-Problems with AllowMultipleInstances
-====================================
-
-The AllowMultipleInstances option is close to what is needed, but
-there are two main problems.
-
-The first problem is that enabling the option will disable some of the
-FirefoxPortable cleanup code. From initial tests, this does not appear
-to leave any additional traces, but more investigation is needed.
-
-The second, and more serious problem, is that enabling the option
-conflicts with WaitForFirefox option. This means that the first time
-Tor Browser Bundle is run, FirefoxPortable will open a Firefox window
-and exit, causing Vidalia to exit too. This occurs even if
-WaitForFirefox is true. When FirefoxPortable is run a second time, it
-starts as normal.
-
-This is probably a bug in FirefoxPortable, and needs to be
-investigated further. If fixed, it looks likely that it will be
-possible to have multiple instances of Firefox





More information about the tor-commits mailing list