tor-commits
Threads by month
- ----- 2025 -----
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- 1 participants
- 213897 discussions

11 Apr '11
commit 6f4d18c705dd82c8888da00512f022ed1ea8e41e
Author: Mike Perry <mikeperry-git(a)fscked.org>
Date: Sun Apr 10 21:53:26 2011 -0700
Update compiled html for design doc.
---
website/design/index.html.en | 218 ++++++++++++++++--------------------------
1 files changed, 81 insertions(+), 137 deletions(-)
diff --git a/website/design/index.html.en b/website/design/index.html.en
index 41c19c5..1afe9e4 100644
--- a/website/design/index.html.en
+++ b/website/design/index.html.en
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Torbutton Design Documentation</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2" /></head><body><div class="article" title="Torbutton Design Documentation"><div class="titlepage"><div><div><h2 class="title"><a id="design"></a>Torbutton Design Documentation</h2></div><div><div class="author"><h3 class="author"><span class="firstname">Mike</span> <span class="surname">Perry</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:mikeperry.fscked/org">mikeperry.fscked/org</a>></code></p></div></div></div></div><div><p class="pubdate">Apr 4 2011</p></div></div><hr /></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id2657298">1. Introduction</a></span></dt><dd><dl><dt><span class="sect2"><a href="#adversary">1.1. Adversary Model</a><
/span></dt><dt><span class="sect2"><a href="#requirements">1.2. Torbutton Requirements</a></span></dt><dt><span class="sect2"><a href="#layout">1.3. Extension Layout</a></span></dt></dl></dd><dt><span class="sect1"><a href="#components">2. Components</a></span></dt><dd><dl><dt><span class="sect2"><a href="#hookedxpcom">2.1. Hooked Components</a></span></dt><dt><span class="sect2"><a href="#id2682565">2.2. New Components</a></span></dt></dl></dd><dt><span class="sect1"><a href="#id2661538">3. Chrome</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id2683477">3.1. XUL Windows and Overlays</a></span></dt><dt><span class="sect2"><a href="#id2679782">3.2. Major Chrome Observers</a></span></dt></dl></dd><dt><span class="sect1"><a href="#id2682210">4. Toggle Code Path</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id2678571">4.1. Button Click</a></span></dt><dt><span class="sect2"><a href="#id2677555">4.2. Proxy Update</a></span></dt><dt><span class="sect2"><a hre
f="#id2671739">4.3. Settings Update</a></span></dt><dt><span class="sect2"><a href="#preferences">4.4. Firefox preferences touched during Toggle</a></span></dt></dl></dd><dt><span class="sect1"><a href="#id2684076">5. Description of Options</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id2686457">5.1. Proxy Settings</a></span></dt><dt><span class="sect2"><a href="#id2685583">5.2. Dynamic Content Settings</a></span></dt><dt><span class="sect2"><a href="#id2695607">5.3. History and Forms Settings</a></span></dt><dt><span class="sect2"><a href="#id2695921">5.4. Cache Settings</a></span></dt><dt><span class="sect2"><a href="#id2696030">5.5. Cookie and Auth Settings</a></span></dt><dt><span class="sect2"><a href="#id2696343">5.6. Startup Settings</a></span></dt><dt><span class="sect2"><a href="#id2696457">5.7. Shutdown Settings</a></span></dt><dt><span class="sect2"><a href="#id2696517">5.8. Header Settings</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Fir
efoxBugs">6. Relevant Firefox Bugs</a></span></dt><dd><dl><dt><span class="sect2"><a href="#FirefoxSecurity">6.1. Bugs impacting security</a></span></dt><dt><span class="sect2"><a href="#FirefoxWishlist">6.2. Bugs blocking functionality</a></span></dt><dt><span class="sect2"><a href="#FirefoxMiscBugs">6.3. Low Priority Bugs</a></span></dt></dl></dd><dt><span class="sect1"><a href="#TestPlan">7. Testing</a></span></dt><dd><dl><dt><span class="sect2"><a href="#SingleStateTesting">7.1. Single state testing</a></span></dt><dt><span class="sect2"><a href="#id2698010">7.2. Multi-state testing</a></span></dt><dt><span class="sect2"><a href="#HackTorbutton">7.3. Active testing (aka How to Hack Torbutton)</a></span></dt></dl></dd></dl></div><div class="sect1" title="1. Introduction"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2657298"></a>1. Introduction</h2></div></div></div><p>
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Torbutton Design Documentation</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2" /></head><body><div class="article" title="Torbutton Design Documentation"><div class="titlepage"><div><div><h2 class="title"><a id="design"></a>Torbutton Design Documentation</h2></div><div><div class="author"><h3 class="author"><span class="firstname">Mike</span> <span class="surname">Perry</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:mikeperry.fscked/org">mikeperry.fscked/org</a>></code></p></div></div></div></div><div><p class="pubdate">Apr 10 2011</p></div></div><hr /></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id2666923">1. Introduction</a></span></dt><dd><dl><dt><span class="sect2"><a href="#adversary">1.1. Adversary Model</a>
</span></dt><dt><span class="sect2"><a href="#requirements">1.2. Torbutton Requirements</a></span></dt><dt><span class="sect2"><a href="#layout">1.3. Extension Layout</a></span></dt></dl></dd><dt><span class="sect1"><a href="#components">2. Components</a></span></dt><dd><dl><dt><span class="sect2"><a href="#hookedxpcom">2.1. Hooked Components</a></span></dt><dt><span class="sect2"><a href="#id2690319">2.2. New Components</a></span></dt></dl></dd><dt><span class="sect1"><a href="#id2681735">3. Chrome</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id2702019">3.1. XUL Windows and Overlays</a></span></dt><dt><span class="sect2"><a href="#id2694797">3.2. Major Chrome Observers</a></span></dt></dl></dd><dt><span class="sect1"><a href="#id2696524">4. Toggle Code Path</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id2699452">4.1. Button Click</a></span></dt><dt><span class="sect2"><a href="#id2697978">4.2. Proxy Update</a></span></dt><dt><span class="sect2"><a hr
ef="#id2697015">4.3. Settings Update</a></span></dt><dt><span class="sect2"><a href="#preferences">4.4. Firefox preferences touched during Toggle</a></span></dt></dl></dd><dt><span class="sect1"><a href="#id2702702">5. Description of Options</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id2704948">5.1. Proxy Settings</a></span></dt><dt><span class="sect2"><a href="#id2686645">5.2. Dynamic Content Settings</a></span></dt><dt><span class="sect2"><a href="#id2705261">5.3. History and Forms Settings</a></span></dt><dt><span class="sect2"><a href="#id2705577">5.4. Cache Settings</a></span></dt><dt><span class="sect2"><a href="#id2705686">5.5. Cookie and Auth Settings</a></span></dt><dt><span class="sect2"><a href="#id2705999">5.6. Startup Settings</a></span></dt><dt><span class="sect2"><a href="#id2706113">5.7. Shutdown Settings</a></span></dt><dt><span class="sect2"><a href="#id2706173">5.8. Header Settings</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Fi
refoxBugs">6. Relevant Firefox Bugs</a></span></dt><dd><dl><dt><span class="sect2"><a href="#TorBrowserBugs">6.1. Tor Browser Bugs</a></span></dt><dt><span class="sect2"><a href="#ToggleModelBugs">6.2. Toggle Model Bugs</a></span></dt></dl></dd><dt><span class="sect1"><a href="#TestPlan">7. Testing</a></span></dt><dd><dl><dt><span class="sect2"><a href="#SingleStateTesting">7.1. Single state testing</a></span></dt><dt><span class="sect2"><a href="#id2707624">7.2. Multi-state testing</a></span></dt><dt><span class="sect2"><a href="#HackTorbutton">7.3. Active testing (aka How to Hack Torbutton)</a></span></dt></dl></dd></dl></div><div class="sect1" title="1. Introduction"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2666923"></a>1. Introduction</h2></div></div></div><p>
This document describes the goals, operation, and testing procedures of the
Torbutton Firefox extension. It is current as of Torbutton 1.3.2.
@@ -195,11 +195,16 @@ From the above Adversary Model, a number of requirements become clear.
MUST NOT bypass Tor proxy settings for any content.</p></li><li class="listitem"><a id="state"></a><span class="command"><strong>State Separation</strong></span><p>Browser state (cookies, cache, history, 'DOM storage'), accumulated in
one Tor state MUST NOT be accessible via the network in
another Tor state.</p></li><li class="listitem"><a id="isolation"></a><span class="command"><strong>Network Isolation</strong></span><p>Pages MUST NOT perform any network activity in a Tor state different
- from the state they were originally loaded in.</p></li><li class="listitem"><a id="undiscoverability"></a><span class="command"><strong>Tor Undiscoverability</strong></span><p>With
+ from the state they were originally loaded in.</p><p>Note that this requirement is
+being de-emphasized due to the coming shift to supporting only the Tor Browser
+Bundles, which do not support a Toggle operation.</p></li><li class="listitem"><a id="undiscoverability"></a><span class="command"><strong>Tor Undiscoverability</strong></span><p>With
the advent of bridge support in Tor 0.2.0.x, there are now a class of Tor
users whose network fingerprint does not obviously betray the fact that they
are using Tor. This should extend to the browser as well - Torbutton MUST NOT
-reveal its presence while Tor is disabled.</p></li><li class="listitem"><a id="disk"></a><span class="command"><strong>Disk Avoidance</strong></span><p>The browser SHOULD NOT write any Tor-related state to disk, or store it
+reveal its presence while Tor is disabled.
+</p><p>Note that this requirement is
+being de-emphasized due to the coming shift to supporting only the Tor Browser
+Bundles, which do not support a Toggle operation.</p></li><li class="listitem"><a id="disk"></a><span class="command"><strong>Disk Avoidance</strong></span><p>The browser SHOULD NOT write any Tor-related state to disk, or store it
in memory beyond the duration of one Tor toggle.</p></li><li class="listitem"><a id="location"></a><span class="command"><strong>Location Neutrality</strong></span><p>The browser SHOULD NOT leak location-specific information, such as
timezone or locale via Tor.</p></li><li class="listitem"><a id="setpreservation"></a><span class="command"><strong>Anonymity Set
Preservation</strong></span><p>The browser SHOULD NOT leak any other anonymity
@@ -250,7 +255,7 @@ do not obey proxy settings, they can be manipulated to automatically connect
back to arbitrary servers outside of Tor with no user intervention. Fixing
this issue helps to satisfy Torbutton's <a class="link" href="#proxy">Proxy
Obedience</a> Requirement.
- </p></div><div class="sect3" title="@mozilla.org/browser/global-history;2 - components/ignore-history.js"><div class="titlepage"><div><div><h4 class="title"><a id="id2669566"></a><a class="ulink" href="http://www.oxymoronical.com/experiments/xpcomref/applications/Firefox/3.5/c…" target="_top">@mozilla.org/browser/global-history;2</a>
+ </p></div><div class="sect3" title="@mozilla.org/browser/global-history;2 - components/ignore-history.js"><div class="titlepage"><div><div><h4 class="title"><a id="id2696239"></a><a class="ulink" href="http://www.oxymoronical.com/experiments/xpcomref/applications/Firefox/3.5/c…" target="_top">@mozilla.org/browser/global-history;2</a>
- <a class="ulink" href="https://gitweb.torproject.org/torbutton.git/blob_plain/HEAD:/src/components…" target="_top">components/ignore-history.js</a></h4></div></div></div><p>This component was contributed by <a class="ulink" href="http://www.collinjackson.com/" target="_top">Collin Jackson</a> as a method for defeating
CSS and Javascript-based methods of history disclosure. The global-history
component is what is used by Firefox to determine if a link was visited or not
@@ -278,7 +283,7 @@ firing in the event the browser starts in Tor mode.
This component helps satisfy the <a class="link" href="#isolation">Network
Isolation</a> and <a class="link" href="#setpreservation">Anonymity Set
Preservation</a> requirements.
-</p></div></div><div class="sect2" title="2.2. New Components"><div class="titlepage"><div><div><h3 class="title"><a id="id2682565"></a>2.2. New Components</h3></div></div></div><p>Torbutton creates four new components that are used throughout the
+</p></div></div><div class="sect2" title="2.2. New Components"><div class="titlepage"><div><div><h3 class="title"><a id="id2690319"></a>2.2. New Components</h3></div></div></div><p>Torbutton creates four new components that are used throughout the
extension. These components do not hook any interfaces, nor are they used
anywhere besides Torbutton itself.</p><div class="sect3" title="@torproject.org/cookie-jar-selector;2 - components/cookie-jar-selector.js"><div class="titlepage"><div><div><h4 class="title"><a id="cookiejar"></a><a class="ulink" href="https://gitweb.torproject.org/torbutton.git/blob_plain/HEAD:/src/components…" target="_top">@torproject.org/cookie-jar-selector;2
- components/cookie-jar-selector.js</a></h4></div></div></div><p>The cookie jar selector (also based on code from <a class="ulink" href="http://www.collinjackson.com/" target="_top">Collin
@@ -290,7 +295,7 @@ state from the XML store.
</p><p>
This component helps to address the <a class="link" href="#state">State
Isolation</a> requirement of Torbutton.
-</p></div><div class="sect3" title="@torproject.org/torbutton-logger;1 - components/torbutton-logger.js"><div class="titlepage"><div><div><h4 class="title"><a id="id2694914"></a><a class="ulink" href="https://gitweb.torproject.org/torbutton.git/blob_plain/HEAD:/src/components…" target="_top">@torproject.org/torbutton-logger;1
+</p></div><div class="sect3" title="@torproject.org/torbutton-logger;1 - components/torbutton-logger.js"><div class="titlepage"><div><div><h4 class="title"><a id="id2683534"></a><a class="ulink" href="https://gitweb.torproject.org/torbutton.git/blob_plain/HEAD:/src/components…" target="_top">@torproject.org/torbutton-logger;1
- components/torbutton-logger.js</a></h4></div></div></div><p>The torbutton logger component allows on-the-fly redirection of torbutton
logging messages to either Firefox stderr
(<span class="command"><strong>extensions.torbutton.logmethod=0</strong></span>), the Javascript error console
@@ -371,17 +376,17 @@ reason are not passed to the Firefox content policy itself (see Firefox Bugs
</p><p>
This helps to fulfill both the <a class="link" href="#setpreservation">Anonymity Set Preservation</a> and the <a class="link" href="#undiscoverability">Tor Undiscoverability</a> requirements of
-Torbutton.</p></div></div></div><div class="sect1" title="3. Chrome"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2661538"></a>3. Chrome</h2></div></div></div><p>The chrome is where all the torbutton graphical elements and windows are
-located. </p><div class="sect2" title="3.1. XUL Windows and Overlays"><div class="titlepage"><div><div><h3 class="title"><a id="id2683477"></a>3.1. XUL Windows and Overlays</h3></div></div></div><p>
+Torbutton.</p></div></div></div><div class="sect1" title="3. Chrome"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2681735"></a>3. Chrome</h2></div></div></div><p>The chrome is where all the torbutton graphical elements and windows are
+located. </p><div class="sect2" title="3.1. XUL Windows and Overlays"><div class="titlepage"><div><div><h3 class="title"><a id="id2702019"></a>3.1. XUL Windows and Overlays</h3></div></div></div><p>
Each window is described as an <a class="ulink" href="http://developer.mozilla.org/en/docs/XUL_Reference" target="_top">XML file</a>, with zero or more Javascript
files attached. The scope of these Javascript files is their containing
window. XUL files that add new elements and script to existing Firefox windows
are called overlays.</p><div class="sect3" title="Browser Overlay - torbutton.xul"><div class="titlepage"><div><div><h4 class="title"><a id="browseroverlay"></a>Browser Overlay - <a class="ulink" href="https://gitweb.torproject.org/torbutton.git/blob_plain/HEAD:/src/chrome/con…" target="_top">torbutton.xul</a></h4></div></div></div><p>The browser overlay, torbutton.xul, defines the toolbar button, the status
bar, and events for toggling the button. The overlay code is in <a class="ulink" href="https://gitweb.torproject.org/torbutton.git/blob_plain/HEAD:/src/chrome/con…" target="_top">chrome/content/torbutton.js</a>.
It contains event handlers for preference update, shutdown, upgrade, and
-location change events.</p></div><div class="sect3" title="Preferences Window - preferences.xul"><div class="titlepage"><div><div><h4 class="title"><a id="id2672297"></a>Preferences Window - <a class="ulink" href="https://gitweb.torproject.org/torbutton.git/blob_plain/HEAD:/src/chrome/con…" target="_top">preferences.xul</a></h4></div></div></div><p>The preferences window of course lays out the Torbutton preferences, with
-handlers located in <a class="ulink" href="https://gitweb.torproject.org/torbutton.git/blob_plain/HEAD:/src/chrome/con…" target="_top">chrome/content/preferences.js</a>.</p></div><div class="sect3" title="Other Windows"><div class="titlepage"><div><div><h4 class="title"><a id="id2689726"></a>Other Windows</h4></div></div></div><p>There are additional windows that describe popups for right clicking on
-the status bar, the toolbutton, and the about page.</p></div></div><div class="sect2" title="3.2. Major Chrome Observers"><div class="titlepage"><div><div><h3 class="title"><a id="id2679782"></a>3.2. Major Chrome Observers</h3></div></div></div><p>
+location change events.</p></div><div class="sect3" title="Preferences Window - preferences.xul"><div class="titlepage"><div><div><h4 class="title"><a id="id2704559"></a>Preferences Window - <a class="ulink" href="https://gitweb.torproject.org/torbutton.git/blob_plain/HEAD:/src/chrome/con…" target="_top">preferences.xul</a></h4></div></div></div><p>The preferences window of course lays out the Torbutton preferences, with
+handlers located in <a class="ulink" href="https://gitweb.torproject.org/torbutton.git/blob_plain/HEAD:/src/chrome/con…" target="_top">chrome/content/preferences.js</a>.</p></div><div class="sect3" title="Other Windows"><div class="titlepage"><div><div><h4 class="title"><a id="id2669673"></a>Other Windows</h4></div></div></div><p>There are additional windows that describe popups for right clicking on
+the status bar, the toolbutton, and the about page.</p></div></div><div class="sect2" title="3.2. Major Chrome Observers"><div class="titlepage"><div><div><h3 class="title"><a id="id2694797"></a>3.2. Major Chrome Observers</h3></div></div></div><p>
In addition to the <a class="link" href="#components" title="2. Components">components described
above</a>, Torbutton also instantiates several observers in the browser
overlay window. These mostly grew due to scoping convenience, and many should
@@ -435,7 +440,7 @@ state tags, plugin permissions, and install the Javascript hooks to hook the
<a class="ulink" href="https://developer.mozilla.org/en/DOM/window.screen" target="_top">window.screen</a>
object to obfuscate browser and desktop resolution information.
-</p></li></ol></div></div></div><div class="sect1" title="4. Toggle Code Path"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2682210"></a>4. Toggle Code Path</h2></div></div></div><p>
+</p></li></ol></div></div></div><div class="sect1" title="4. Toggle Code Path"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2696524"></a>4. Toggle Code Path</h2></div></div></div><p>
The act of toggling is connected to <code class="function">torbutton_toggle()</code>
via the <a class="ulink" href="https://gitweb.torproject.org/torbutton.git/blob_plain/HEAD:/src/chrome/con…" target="_top">torbutton.xul</a>
@@ -456,7 +461,7 @@ conditions and leakage, especially with <a class="ulink" href="https://bugzilla.
409737</a> unfixed. The content policy does not allow any network activity
whatsoever during this three stage transition.
- </p><div class="sect2" title="4.1. Button Click"><div class="titlepage"><div><div><h3 class="title"><a id="id2678571"></a>4.1. Button Click</h3></div></div></div><p>
+ </p><div class="sect2" title="4.1. Button Click"><div class="titlepage"><div><div><h3 class="title"><a id="id2699452"></a>4.1. Button Click</h3></div></div></div><p>
This is the first step in the toggling process. When the user clicks the
toggle button or the toolbar, <code class="function">torbutton_toggle()</code> is
@@ -469,7 +474,7 @@ observer</a>
<span class="command"><strong>torbutton_unique_pref_observer</strong></span> to perform the rest of the
toggle.
- </p></div><div class="sect2" title="4.2. Proxy Update"><div class="titlepage"><div><div><h3 class="title"><a id="id2677555"></a>4.2. Proxy Update</h3></div></div></div><p>
+ </p></div><div class="sect2" title="4.2. Proxy Update"><div class="titlepage"><div><div><h3 class="title"><a id="id2697978"></a>4.2. Proxy Update</h3></div></div></div><p>
When Torbutton receives any proxy change notifications via its
<span class="command"><strong>torbutton_unique_pref_observer</strong></span>, it calls
@@ -484,7 +489,7 @@ value. This is decoupled from the button click functionality via the pref
observer so that other addons (such as SwitchProxy) can switch the proxy
settings between multiple proxies.
- </p></div><div class="sect2" title="4.3. Settings Update"><div class="titlepage"><div><div><h3 class="title"><a id="id2671739"></a>4.3. Settings Update</h3></div></div></div><p>
+ </p></div><div class="sect2" title="4.3. Settings Update"><div class="titlepage"><div><div><h3 class="title"><a id="id2697015"></a>4.3. Settings Update</h3></div></div></div><p>
The next stage is also handled by
<code class="function">torbutton_update_status()</code>. This function sets scores of
@@ -611,10 +616,10 @@ enabled. This helps Torbutton fulfill its <a class="link" href="#disk">Disk
Avoidance</a> and <a class="link" href="#state">State Separation</a>
requirements.
- </p></li></ol></div></div></div><div class="sect1" title="5. Description of Options"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2684076"></a>5. Description of Options</h2></div></div></div><p>This section provides a detailed description of Torbutton's options. Each
+ </p></li></ol></div></div></div><div class="sect1" title="5. Description of Options"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2702702"></a>5. Description of Options</h2></div></div></div><p>This section provides a detailed description of Torbutton's options. Each
option is presented as the string from the preferences window, a summary, the
preferences it touches, and the effect this has on the components, chrome, and
-browser properties.</p><div class="sect2" title="5.1. Proxy Settings"><div class="titlepage"><div><div><h3 class="title"><a id="id2686457"></a>5.1. Proxy Settings</h3></div></div></div><div class="sect3" title="Test Settings"><div class="titlepage"><div><div><h4 class="title"><a id="id2688146"></a>Test Settings</h4></div></div></div><p>
+browser properties.</p><div class="sect2" title="5.1. Proxy Settings"><div class="titlepage"><div><div><h3 class="title"><a id="id2704948"></a>5.1. Proxy Settings</h3></div></div></div><div class="sect3" title="Test Settings"><div class="titlepage"><div><div><h4 class="title"><a id="id2683681"></a>Test Settings</h4></div></div></div><p>
This button under the Proxy Settings tab provides a way to verify that the
proxy settings are correct, and actually do route through the Tor network. It
performs this check by issuing an <a class="ulink" href="http://developer.mozilla.org/en/docs/XMLHttpRequest" target="_top">XMLHTTPRequest</a>
@@ -629,7 +634,7 @@ Presenting the results to the user is handled by the <a class="ulink" href="http
window</a>
callback <code class="function">torbutton_prefs_test_settings()</code> in <a class="ulink" href="https://gitweb.torproject.org/torbutton.git/blob_plain/HEAD:/src/chrome/con…" target="_top">preferences.js</a>.
- </p></div></div><div class="sect2" title="5.2. Dynamic Content Settings"><div class="titlepage"><div><div><h3 class="title"><a id="id2685583"></a>5.2. Dynamic Content Settings</h3></div></div></div><div class="sect3" title="Disable plugins on Tor Usage (crucial)"><div class="titlepage"><div><div><h4 class="title"><a id="plugins"></a>Disable plugins on Tor Usage (crucial)</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.no_tor_plugins</strong></span></p><p>Java and plugins <a class="ulink" href="http://java.sun.com/j2se/1.5.0/docs/api/java/net/class-use/NetworkInterface…" target="_top">can query</a> the <a class="ulink" href="http://www.rgagnon.com/javadetails/java-0095.html" target="_top">local IP
+ </p></div></div><div class="sect2" title="5.2. Dynamic Content Settings"><div class="titlepage"><div><div><h3 class="title"><a id="id2686645"></a>5.2. Dynamic Content Settings</h3></div></div></div><div class="sect3" title="Disable plugins on Tor Usage (crucial)"><div class="titlepage"><div><div><h4 class="title"><a id="plugins"></a>Disable plugins on Tor Usage (crucial)</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.no_tor_plugins</strong></span></p><p>Java and plugins <a class="ulink" href="http://java.sun.com/j2se/1.5.0/docs/api/java/net/class-use/NetworkInterface…" target="_top">can query</a> the <a class="ulink" href="http://www.rgagnon.com/javadetails/java-0095.html" target="_top">local IP
address</a> and report it back to the
remote site. They can also <a class="ulink" href="http://decloak.net" target="_top">bypass proxy settings</a> and directly connect to a
remote site without Tor. Every browser plugin we have tested with Firefox has
@@ -673,7 +678,7 @@ all this and the plugin managed to find some way to load.
Since most plugins completely ignore browser proxy settings, the actions
performed by this setting are crucial to satisfying the <a class="link" href="#proxy">Proxy Obedience</a> requirement.
- </p></div><div class="sect3" title="Isolate Dynamic Content to Tor State (crucial)"><div class="titlepage"><div><div><h4 class="title"><a id="id2684833"></a>Isolate Dynamic Content to Tor State (crucial)</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.isolate_content</strong></span></p><p>Enabling this preference is what enables the <a class="ulink" href="https://gitweb.torproject.org/torbutton.git/blob_plain/HEAD:/src/components…" target="_top">@torproject.org/cssblocker;1</a> content policy
+ </p></div><div class="sect3" title="Isolate Dynamic Content to Tor State (crucial)"><div class="titlepage"><div><div><h4 class="title"><a id="id2688604"></a>Isolate Dynamic Content to Tor State (crucial)</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.isolate_content</strong></span></p><p>Enabling this preference is what enables the <a class="ulink" href="https://gitweb.torproject.org/torbutton.git/blob_plain/HEAD:/src/components…" target="_top">@torproject.org/cssblocker;1</a> content policy
mentioned above, and causes it to block content load attempts in pages an
opposite Tor state from the current state. Freshly loaded <a class="ulink" href="https://developer.mozilla.org/en/XUL/tabbrowser" target="_top">browser
tabs</a> are tagged
@@ -725,7 +730,8 @@ We are still looking for a workaround as of Torbutton 1.3.2.
-</p></div><div class="sect3" title="Resize windows to multiples of 50px during Tor usage (recommended)"><div class="titlepage"><div><div><h4 class="title"><a id="id2653668"></a>Resize windows to multiples of 50px during Tor usage (recommended)</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.resize_windows</strong></span></p><p>
+
+</p></div><div class="sect3" title="Resize windows to multiples of 50px during Tor usage (recommended)"><div class="titlepage"><div><div><h4 class="title"><a id="id2663307"></a>Resize windows to multiples of 50px during Tor usage (recommended)</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.resize_windows</strong></span></p><p>
This option drastically cuts down on the number of distinct anonymity sets
that divide the Tor web userbase. Without this setting, the dimensions for a
@@ -760,7 +766,7 @@ infer toolbar size/presence by the distance to the nearest 50 pixel roundoff).
</p><p>
This setting helps to meet the <a class="link" href="#setpreservation">Anonymity Set Preservation</a> requirements.
-</p></div><div class="sect3" title="Disable Search Suggestions during Tor (recommended)"><div class="titlepage"><div><div><h4 class="title"><a id="id2653753"></a>Disable Search Suggestions during Tor (recommended)</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.no_search</strong></span></p><p>
+</p></div><div class="sect3" title="Disable Search Suggestions during Tor (recommended)"><div class="titlepage"><div><div><h4 class="title"><a id="id2663391"></a>Disable Search Suggestions during Tor (recommended)</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.no_search</strong></span></p><p>
This setting causes Torbutton to disable <a class="ulink" href="http://kb.mozillazine.org/Browser.search.suggest.enabled" target="_top"><span class="command"><strong>browser.search.suggest.enabled</strong></span></a>
during Tor usage.
This governs if you get Google search suggestions during Tor
@@ -771,7 +777,7 @@ this is recommended to be disabled.
While this setting doesn't satisfy any Torbutton requirements, the fact that
cookies are transmitted for partially typed queries does not seem desirable
for Tor usage.
-</p></div><div class="sect3" title="Disable Updates During Tor"><div class="titlepage"><div><div><h4 class="title"><a id="id2653792"></a>Disable Updates During Tor</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.no_updates</strong></span></p><p>This setting causes Torbutton to disable the four <a class="ulink" href="http://wiki.mozilla.org/Update:Users/Checking_For_Updates#Preference_Contro…" target="_top">Firefox
+</p></div><div class="sect3" title="Disable Updates During Tor"><div class="titlepage"><div><div><h4 class="title"><a id="id2663430"></a>Disable Updates During Tor</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.no_updates</strong></span></p><p>This setting causes Torbutton to disable the four <a class="ulink" href="http://wiki.mozilla.org/Update:Users/Checking_For_Updates#Preference_Contro…" target="_top">Firefox
update settings</a> during Tor
usage: <span class="command"><strong>extensions.update.enabled</strong></span>,
<span class="command"><strong>app.update.enabled</strong></span>,
@@ -781,7 +787,7 @@ update settings</a> during Tor
checking for search plugin updates while Tor is enabled.
</p><p>
This setting satisfies the <a class="link" href="#updates">Update Safety</a> requirement.
-</p></div><div class="sect3" title="Redirect Torbutton Updates Via Tor (recommended)"><div class="titlepage"><div><div><h4 class="title"><a id="id2653854"></a>Redirect Torbutton Updates Via Tor (recommended)</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.update_torbutton_via_tor</strong></span></p><p>This setting causes Torbutton to install an
+</p></div><div class="sect3" title="Redirect Torbutton Updates Via Tor (recommended)"><div class="titlepage"><div><div><h4 class="title"><a id="id2663492"></a>Redirect Torbutton Updates Via Tor (recommended)</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.update_torbutton_via_tor</strong></span></p><p>This setting causes Torbutton to install an
<a class="ulink" href="https://developer.mozilla.org/en/nsIProtocolProxyFilter" target="_top">nsIProtocolProxyFilter</a>
in order to redirect all version update checks and Torbutton update downloads
@@ -790,7 +796,7 @@ concerns about data retention done by <a class="ulink" href="https://www.addons.
help censored users meet the <a class="link" href="#undiscoverability">Tor
Undiscoverability</a> requirement.
- </p></div><div class="sect3" title="Disable livemarks updates during Tor usage (recommended)"><div class="titlepage"><div><div><h4 class="title"><a id="id2653898"></a>Disable livemarks updates during Tor usage (recommended)</h4></div></div></div><p>Option:
+ </p></div><div class="sect3" title="Disable livemarks updates during Tor usage (recommended)"><div class="titlepage"><div><div><h4 class="title"><a id="id2663536"></a>Disable livemarks updates during Tor usage (recommended)</h4></div></div></div><p>Option:
</p><table border="0" summary="Simple list" class="simplelist"><tr><td><span class="command"><strong>extensions.torbutton.disable_livemarks</strong></span></td></tr></table><p>
</p><p>
@@ -805,7 +811,7 @@ service</a> when Tor is enabled.
This helps satisfy the <a class="link" href="#isolation">Network
Isolation</a> and <a class="link" href="#setpreservation">Anonymity Set
Preservation</a> requirements.
-</p></div><div class="sect3" title="Block Tor/Non-Tor access to network from file:// urls (recommended)"><div class="titlepage"><div><div><h4 class="title"><a id="id2653969"></a>Block Tor/Non-Tor access to network from file:// urls (recommended)</h4></div></div></div><p>Options:
+</p></div><div class="sect3" title="Block Tor/Non-Tor access to network from file:// urls (recommended)"><div class="titlepage"><div><div><h4 class="title"><a id="id2663607"></a>Block Tor/Non-Tor access to network from file:// urls (recommended)</h4></div></div></div><p>Options:
</p><table border="0" summary="Simple list" class="simplelist"><tr><td><span class="command"><strong>extensions.torbutton.block_tor_file_net</strong></span></td></tr><tr><td><span class="command"><strong>extensions.torbutton.block_nontor_file_net</strong></span></td></tr></table><p>
</p><p>
@@ -825,7 +831,7 @@ Isolation</a> requirement, by preventing file urls from executing network
operations in opposite Tor states. Also, allowing pages to submit arbitrary
files to arbitrary sites just generally seems like a bad idea.
-</p></div><div class="sect3" title="Close all Tor/Non-Tor tabs and windows on toggle (optional)"><div class="titlepage"><div><div><h4 class="title"><a id="id2654041"></a>Close all Tor/Non-Tor tabs and windows on toggle (optional)</h4></div></div></div><p>Options:
+</p></div><div class="sect3" title="Close all Tor/Non-Tor tabs and windows on toggle (optional)"><div class="titlepage"><div><div><h4 class="title"><a id="id2663679"></a>Close all Tor/Non-Tor tabs and windows on toggle (optional)</h4></div></div></div><p>Options:
</p><table border="0" summary="Simple list" class="simplelist"><tr><td><span class="command"><strong>extensions.torbutton.close_nontor</strong></span></td></tr><tr><td><span class="command"><strong>extensions.torbutton.close_tor</strong></span></td></tr></table><p>
</p><p>
@@ -849,7 +855,7 @@ out longer than necessary.
While this setting doesn't satisfy any Torbutton requirements, the fact that
cookies are transmitted for partially typed queries does not seem desirable
for Tor usage.
-</p></div></div><div class="sect2" title="5.3. History and Forms Settings"><div class="titlepage"><div><div><h3 class="title"><a id="id2695607"></a>5.3. History and Forms Settings</h3></div></div></div><div class="sect3" title="Isolate Access to History navigation to Tor state (crucial)"><div class="titlepage"><div><div><h4 class="title"><a id="id2695612"></a>Isolate Access to History navigation to Tor state (crucial)</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.block_js_history</strong></span></p><p>
+</p></div></div><div class="sect2" title="5.3. History and Forms Settings"><div class="titlepage"><div><div><h3 class="title"><a id="id2705261"></a>5.3. History and Forms Settings</h3></div></div></div><div class="sect3" title="Isolate Access to History navigation to Tor state (crucial)"><div class="titlepage"><div><div><h4 class="title"><a id="id2705267"></a>Isolate Access to History navigation to Tor state (crucial)</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.block_js_history</strong></span></p><p>
This setting determines if Torbutton installs an <a class="ulink" href="http://www.oxymoronical.com/experiments/apidocs/interface/nsISHistoryListen…" target="_top">nsISHistoryListener</a>
attached to the <a class="ulink" href="http://www.oxymoronical.com/experiments/apidocs/interface/nsISHistory" target="_top">sessionHistory</a> of
of each browser's <a class="ulink" href="https://developer.mozilla.org/en/XUL%3aProperty%3awebNavigation" target="_top">webNavigatator</a>.
@@ -877,7 +883,7 @@ This setting helps to fulfill Torbutton's <a class="link" href="#state">State
Separation</a> and (until Bug 409737 is fixed) <a class="link" href="#isolation">Network Isolation</a>
requirements.
- </p></div><div class="sect3" title="History Access Settings"><div class="titlepage"><div><div><h4 class="title"><a id="id2695690"></a>History Access Settings</h4></div></div></div><p>Options:
+ </p></div><div class="sect3" title="History Access Settings"><div class="titlepage"><div><div><h4 class="title"><a id="id2705344"></a>History Access Settings</h4></div></div></div><p>Options:
</p><table border="0" summary="Simple list" class="simplelist"><tr><td><span class="command"><strong>extensions.torbutton.block_thread</strong></span></td></tr><tr><td><span class="command"><strong>extensions.torbutton.block_nthread</strong></span></td></tr><tr><td><span class="command"><strong>extensions.torbutton.block_thwrite</strong></span></td></tr><tr><td><span class="command"><strong>extensions.torbutton.block_nthwrite</strong></span></td></tr></table><p>
</p><p>On Firefox 3.x, these four settings govern the behavior of the <a class="ulink" href="https://gitweb.torproject.org/torbutton.git/blob_plain/HEAD:/src/components…" target="_top">components/ignore-history.js</a>
history blocker component mentioned above. By hooking the browser's view of
@@ -898,12 +904,12 @@ above prefs. We then only need to link the write prefs to
history store while set.
</p><p>
This setting helps to satisfy the <a class="link" href="#state">State Separation</a> and <a class="link" href="#disk">Disk Avoidance</a> requirements.
-</p></div><div class="sect3" title="Clear History During Tor Toggle (optional)"><div class="titlepage"><div><div><h4 class="title"><a id="id2695816"></a>Clear History During Tor Toggle (optional)</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.clear_history</strong></span></p><p>This setting governs if Torbutton calls
+</p></div><div class="sect3" title="Clear History During Tor Toggle (optional)"><div class="titlepage"><div><div><h4 class="title"><a id="id2705472"></a>Clear History During Tor Toggle (optional)</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.clear_history</strong></span></p><p>This setting governs if Torbutton calls
<a class="ulink" href="https://developer.mozilla.org/en/nsIBrowserHistory#removeAllPages.28.29" target="_top">nsIBrowserHistory.removeAllPages</a>
and <a class="ulink" href="http://www.oxymoronical.com/experiments/apidocs/interface/nsISHistory" target="_top">nsISHistory.PurgeHistory</a>
for each tab on Tor toggle.</p><p>
This setting is an optional way to help satisfy the <a class="link" href="#state">State Separation</a> requirement.
-</p></div><div class="sect3" title="Block Password+Form saving during Tor/Non-Tor"><div class="titlepage"><div><div><h4 class="title"><a id="id2695859"></a>Block Password+Form saving during Tor/Non-Tor</h4></div></div></div><p>Options:
+</p></div><div class="sect3" title="Block Password+Form saving during Tor/Non-Tor"><div class="titlepage"><div><div><h4 class="title"><a id="id2705515"></a>Block Password+Form saving during Tor/Non-Tor</h4></div></div></div><p>Options:
</p><table border="0" summary="Simple list" class="simplelist"><tr><td><span class="command"><strong>extensions.torbutton.block_tforms</strong></span></td></tr><tr><td><span class="command"><strong>extensions.torbutton.block_ntforms</strong></span></td></tr></table><p>
</p><p>These settings govern if Torbutton disables
<span class="command"><strong>browser.formfill.enable</strong></span>
@@ -912,19 +918,19 @@ Since form fields can be read at any time by Javascript, this setting is a lot
more important than it seems.
</p><p>
This setting helps to satisfy the <a class="link" href="#state">State Separation</a> and <a class="link" href="#disk">Disk Avoidance</a> requirements.
-</p></div></div><div class="sect2" title="5.4. Cache Settings"><div class="titlepage"><div><div><h3 class="title"><a id="id2695921"></a>5.4. Cache Settings</h3></div></div></div><div class="sect3" title="Block Tor disk cache and clear all cache on Tor Toggle"><div class="titlepage"><div><div><h4 class="title"><a id="id2695926"></a>Block Tor disk cache and clear all cache on Tor Toggle</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.clear_cache</strong></span>
+</p></div></div><div class="sect2" title="5.4. Cache Settings"><div class="titlepage"><div><div><h3 class="title"><a id="id2705577"></a>5.4. Cache Settings</h3></div></div></div><div class="sect3" title="Block Tor disk cache and clear all cache on Tor Toggle"><div class="titlepage"><div><div><h4 class="title"><a id="id2705582"></a>Block Tor disk cache and clear all cache on Tor Toggle</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.clear_cache</strong></span>
</p><p>This option causes Torbutton to call <a class="ulink" href="https://developer.mozilla.org/en/nsICacheService#evictEntries.28.29" target="_top">nsICacheService.evictEntries(0)</a>
on Tor toggle to remove all entries from the cache. In addition, this setting
causes Torbutton to set <a class="ulink" href="http://kb.mozillazine.org/Browser.cache.disk.enable" target="_top">browser.cache.disk.enable</a> to false.
</p><p>
This setting helps to satisfy the <a class="link" href="#state">State Separation</a> and <a class="link" href="#disk">Disk Avoidance</a> requirements.
-</p></div><div class="sect3" title="Block disk and memory cache during Tor"><div class="titlepage"><div><div><h4 class="title"><a id="id2695976"></a>Block disk and memory cache during Tor</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.block_cache</strong></span></p><p>This setting
+</p></div><div class="sect3" title="Block disk and memory cache during Tor"><div class="titlepage"><div><div><h4 class="title"><a id="id2705632"></a>Block disk and memory cache during Tor</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.block_cache</strong></span></p><p>This setting
causes Torbutton to set <a class="ulink" href="http://kb.mozillazine.org/Browser.cache.memory.enable" target="_top">browser.cache.memory.enable</a>,
<a class="ulink" href="http://kb.mozillazine.org/Browser.cache.disk.enable" target="_top">browser.cache.disk.enable</a> and
<a class="ulink" href="http://kb.mozillazine.org/Network.http.use-cache" target="_top">network.http.use-cache</a> to false during tor usage.
</p><p>
This setting helps to satisfy the <a class="link" href="#state">State Separation</a> and <a class="link" href="#disk">Disk Avoidance</a> requirements.
-</p></div></div><div class="sect2" title="5.5. Cookie and Auth Settings"><div class="titlepage"><div><div><h3 class="title"><a id="id2696030"></a>5.5. Cookie and Auth Settings</h3></div></div></div><div class="sect3" title="Clear Cookies on Tor Toggle"><div class="titlepage"><div><div><h4 class="title"><a id="id2696035"></a>Clear Cookies on Tor Toggle</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.clear_cookies</strong></span>
+</p></div></div><div class="sect2" title="5.5. Cookie and Auth Settings"><div class="titlepage"><div><div><h3 class="title"><a id="id2705686"></a>5.5. Cookie and Auth Settings</h3></div></div></div><div class="sect3" title="Clear Cookies on Tor Toggle"><div class="titlepage"><div><div><h4 class="title"><a id="id2705691"></a>Clear Cookies on Tor Toggle</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.clear_cookies</strong></span>
</p><p>
This setting causes Torbutton to call <a class="ulink" href="https://developer.mozilla.org/en/nsICookieManager#removeAll.28.29" target="_top">nsICookieManager.removeAll()</a> on
@@ -934,7 +940,7 @@ which prevents them from being written to disk.
</p><p>
This setting helps to satisfy the <a class="link" href="#state">State Separation</a> and <a class="link" href="#disk">Disk Avoidance</a> requirements.
-</p></div><div class="sect3" title="Store Non-Tor cookies in a protected jar"><div class="titlepage"><div><div><h4 class="title"><a id="id2696086"></a>Store Non-Tor cookies in a protected jar</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.cookie_jars</strong></span>
+</p></div><div class="sect3" title="Store Non-Tor cookies in a protected jar"><div class="titlepage"><div><div><h4 class="title"><a id="id2705742"></a>Store Non-Tor cookies in a protected jar</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.cookie_jars</strong></span>
</p><p>
This setting causes Torbutton to use <a class="ulink" href="https://gitweb.torproject.org/torbutton.git/blob_plain/HEAD:/src/components…" target="_top">@torproject.org/cookie-jar-selector;2</a> to store
@@ -947,15 +953,15 @@ which prevents them from being written to disk.
</p><p>
This setting helps to satisfy the <a class="link" href="#state">State Separation</a> and <a class="link" href="#disk">Disk Avoidance</a> requirements.
-</p></div><div class="sect3" title="Store both Non-Tor and Tor cookies in a protected jar (dangerous)"><div class="titlepage"><div><div><h4 class="title"><a id="id2696143"></a>Store both Non-Tor and Tor cookies in a protected jar (dangerous)</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.dual_cookie_jars</strong></span>
+</p></div><div class="sect3" title="Store both Non-Tor and Tor cookies in a protected jar (dangerous)"><div class="titlepage"><div><div><h4 class="title"><a id="id2705799"></a>Store both Non-Tor and Tor cookies in a protected jar (dangerous)</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.dual_cookie_jars</strong></span>
</p><p>
This setting causes Torbutton to use <a class="ulink" href="https://gitweb.torproject.org/torbutton.git/blob_plain/HEAD:/src/components…" target="_top">@torproject.org/cookie-jar-selector;2</a> to store
both Tor and Non-Tor cookies into protected jars.
</p><p>
This setting helps to satisfy the <a class="link" href="#state">State Separation</a> requirement.
-</p></div><div class="sect3" title="Manage My Own Cookies (dangerous)"><div class="titlepage"><div><div><h4 class="title"><a id="id2696185"></a>Manage My Own Cookies (dangerous)</h4></div></div></div><p>Options: None</p><p>This setting disables all Torbutton cookie handling by setting the above
-cookie prefs all to false.</p></div><div class="sect3" title="Disable DOM Storage during Tor usage (crucial)"><div class="titlepage"><div><div><h4 class="title"><a id="id2696201"></a>Disable DOM Storage during Tor usage (crucial)</h4></div></div></div><div class="sect3" title="Do not write Tor/Non-Tor cookies to disk"><div class="titlepage"><div><div><h4 class="title"><a id="id2696203"></a>Do not write Tor/Non-Tor cookies to disk</h4></div></div></div><p>Options:
+</p></div><div class="sect3" title="Manage My Own Cookies (dangerous)"><div class="titlepage"><div><div><h4 class="title"><a id="id2705841"></a>Manage My Own Cookies (dangerous)</h4></div></div></div><p>Options: None</p><p>This setting disables all Torbutton cookie handling by setting the above
+cookie prefs all to false.</p></div><div class="sect3" title="Disable DOM Storage during Tor usage (crucial)"><div class="titlepage"><div><div><h4 class="title"><a id="id2705856"></a>Disable DOM Storage during Tor usage (crucial)</h4></div></div></div><div class="sect3" title="Do not write Tor/Non-Tor cookies to disk"><div class="titlepage"><div><div><h4 class="title"><a id="id2705859"></a>Do not write Tor/Non-Tor cookies to disk</h4></div></div></div><p>Options:
</p><table border="0" summary="Simple list" class="simplelist"><tr><td><span class="command"><strong>extensions.torbutton.tor_memory_jar</strong></span></td></tr><tr><td><span class="command"><strong>extensions.torbutton.nontor_memory_jar</strong></span></td></tr></table><p>
</p><p>
These settings (contributed by arno) cause Torbutton to set <a class="ulink" href="http://kb.mozillazine.org/Network.cookie.lifetimePolicy" target="_top">network.cookie.lifetimePolicy</a>
@@ -975,13 +981,13 @@ usage to prevent
<a class="ulink" href="http://developer.mozilla.org/en/docs/DOM:Storage" target="_top">DOM Storage</a> from
being used to store persistent information across Tor states.</p><p>
This setting helps to satisfy the <a class="link" href="#state">State Separation</a> requirement.
-</p></div><div class="sect3" title="Clear HTTP Auth on Tor Toggle (recommended)"><div class="titlepage"><div><div><h4 class="title"><a id="id2696304"></a>Clear HTTP Auth on Tor Toggle (recommended)</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.clear_http_auth</strong></span>
+</p></div><div class="sect3" title="Clear HTTP Auth on Tor Toggle (recommended)"><div class="titlepage"><div><div><h4 class="title"><a id="id2705960"></a>Clear HTTP Auth on Tor Toggle (recommended)</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.clear_http_auth</strong></span>
</p><p>
This setting causes Torbutton to call <a class="ulink" href="http://www.oxymoronical.com/experiments/apidocs/interface/nsIHttpAuthManager" target="_top">nsIHttpAuthManager.clearAll()</a>
every time Tor is toggled.
</p><p>
This setting helps to satisfy the <a class="link" href="#state">State Separation</a> requirement.
-</p></div></div><div class="sect2" title="5.6. Startup Settings"><div class="titlepage"><div><div><h3 class="title"><a id="id2696343"></a>5.6. Startup Settings</h3></div></div></div><div class="sect3" title="On Browser Startup, set Tor state to: Tor, Non-Tor"><div class="titlepage"><div><div><h4 class="title"><a id="id2696348"></a>On Browser Startup, set Tor state to: Tor, Non-Tor</h4></div></div></div><p>Options:
+</p></div></div><div class="sect2" title="5.6. Startup Settings"><div class="titlepage"><div><div><h3 class="title"><a id="id2705999"></a>5.6. Startup Settings</h3></div></div></div><div class="sect3" title="On Browser Startup, set Tor state to: Tor, Non-Tor"><div class="titlepage"><div><div><h4 class="title"><a id="id2706004"></a>On Browser Startup, set Tor state to: Tor, Non-Tor</h4></div></div></div><p>Options:
<span class="command"><strong>extensions.torbutton.restore_tor</strong></span>
</p><p>This option governs what Tor state tor is loaded in to.
<code class="function">torbutton_set_initial_state()</code> covers the case where the
@@ -995,7 +1001,7 @@ setting helps to satisfy the <a class="link" href="#state">State Separation</a>
requirement in the event of Firefox crashes by ensuring all cookies,
settings and saved sessions are reloaded from a fixed Tor state.
-</p></div><div class="sect3" title="Prevent session store from saving Non-Tor/Tor-loaded tabs"><div class="titlepage"><div><div><h4 class="title"><a id="id2696399"></a>Prevent session store from saving Non-Tor/Tor-loaded tabs</h4></div></div></div><p>Options:
+</p></div><div class="sect3" title="Prevent session store from saving Non-Tor/Tor-loaded tabs"><div class="titlepage"><div><div><h4 class="title"><a id="id2706055"></a>Prevent session store from saving Non-Tor/Tor-loaded tabs</h4></div></div></div><p>Options:
</p><table border="0" summary="Simple list" class="simplelist"><tr><td><span class="command"><strong>extensions.torbutton.nonontor_sessionstore</strong></span></td></tr><tr><td><span class="command"><strong>extensions.torbutton.notor_sessionstore</strong></span></td></tr></table><p>
</p><p>If these options are enabled, the <a class="link" href="#tbsessionstore" title="@torproject.org/torbutton-ss-blocker;1">tbSessionStore.js</a> component uses the session
store listeners to filter out the appropriate tabs before writing the session
@@ -1005,7 +1011,7 @@ This setting helps to satisfy the <a class="link" href="#disk">Disk Avoidance</a
requirement, and also helps to satisfy the <a class="link" href="#state">State Separation</a> requirement in the event of Firefox
crashes.
-</p></div></div><div class="sect2" title="5.7. Shutdown Settings"><div class="titlepage"><div><div><h3 class="title"><a id="id2696457"></a>5.7. Shutdown Settings</h3></div></div></div><div class="sect3" title="Clear cookies on Tor/Non-Tor shutdown"><div class="titlepage"><div><div><h4 class="title"><a id="id2696463"></a>Clear cookies on Tor/Non-Tor shutdown</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.shutdown_method</strong></span>
+</p></div></div><div class="sect2" title="5.7. Shutdown Settings"><div class="titlepage"><div><div><h3 class="title"><a id="id2706113"></a>5.7. Shutdown Settings</h3></div></div></div><div class="sect3" title="Clear cookies on Tor/Non-Tor shutdown"><div class="titlepage"><div><div><h4 class="title"><a id="id2706119"></a>Clear cookies on Tor/Non-Tor shutdown</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.shutdown_method</strong></span>
</p><p> This option variable can actually take 3 values: 0, 1, and 2. 0 means no
cookie clearing, 1 means clear only during Tor-enabled shutdown, and 2 means
clear for both Tor and Non-Tor shutdown. When set to 1 or 2, Torbutton listens
@@ -1014,7 +1020,7 @@ for the <a class="ulink" href="http://developer.mozilla.org/en/docs/Observer_Not
to clear out all cookies and all cookie jars upon shutdown.
</p><p>
This setting helps to satisfy the <a class="link" href="#state">State Separation</a> requirement.
-</p></div></div><div class="sect2" title="5.8. Header Settings"><div class="titlepage"><div><div><h3 class="title"><a id="id2696517"></a>5.8. Header Settings</h3></div></div></div><div class="sect3" title="Set user agent during Tor usage (crucial)"><div class="titlepage"><div><div><h4 class="title"><a id="id2696523"></a>Set user agent during Tor usage (crucial)</h4></div></div></div><p>Options:
+</p></div></div><div class="sect2" title="5.8. Header Settings"><div class="titlepage"><div><div><h3 class="title"><a id="id2706173"></a>5.8. Header Settings</h3></div></div></div><div class="sect3" title="Set user agent during Tor usage (crucial)"><div class="titlepage"><div><div><h4 class="title"><a id="id2706179"></a>Set user agent during Tor usage (crucial)</h4></div></div></div><p>Options:
</p><table border="0" summary="Simple list" class="simplelist"><tr><td><span class="command"><strong>extensions.torbutton.set_uagent</strong></span></td></tr><tr><td><span class="command"><strong>extensions.torbutton.platform_override</strong></span></td></tr><tr><td><span class="command"><strong>extensions.torbutton.oscpu_override</strong></span></td></tr><tr><td><span class="command"><strong>extensions.torbutton.buildID_override</strong></span></td></tr><tr><td><span class="command"><strong>extensions.torbutton.productsub_override</strong></span></td></tr><tr><td><span class="command"><strong>extensions.torbutton.appname_override</strong></span></td></tr><tr><td><span class="command"><strong>extensions.torbutton.appversion_override</strong></span></td></tr><tr><td><span class="command"><strong>extensions.torbutton.useragent_override</strong></span></td></tr><tr><td><span class="command"><strong>extensions.torbutton.useragent_vendor</strong></span></td></tr><tr><td><span
class="command"><strong>extensions.torbutton.useragent_vendorSub</strong></span></td></tr></table><p>
</p><p>On face, user agent switching appears to be straight-forward in Firefox.
It provides several options for controlling the browser user agent string:
@@ -1038,7 +1044,7 @@ certain resource:// files</a>. These cases are handled by Torbutton's
</p><p>
This setting helps to satisfy the <a class="link" href="#setpreservation">Anonymity Set Preservation</a> requirement.
-</p></div><div class="sect3" title="Spoof US English Browser"><div class="titlepage"><div><div><h4 class="title"><a id="id2696697"></a>Spoof US English Browser</h4></div></div></div><p>Options:
+</p></div><div class="sect3" title="Spoof US English Browser"><div class="titlepage"><div><div><h4 class="title"><a id="id2706353"></a>Spoof US English Browser</h4></div></div></div><p>Options:
</p><table border="0" summary="Simple list" class="simplelist"><tr><td><span class="command"><strong>extensions.torbutton.spoof_english</strong></span></td></tr><tr><td><span class="command"><strong>extensions.torbutton.spoof_charset</strong></span></td></tr><tr><td><span class="command"><strong>extensions.torbutton.spoof_language</strong></span></td></tr></table><p>
</p><p> This option causes Torbutton to set
<span class="command"><strong>general.useragent.locale</strong></span>
@@ -1049,7 +1055,7 @@ This setting helps to satisfy the <a class="link" href="#setpreservation">Anonym
well as hooking <span class="command"><strong>navigator.language</strong></span> via its <a class="link" href="#jshooks" title="Hook Dangerous Javascript">javascript hooks</a>.
</p><p>
This setting helps to satisfy the <a class="link" href="#setpreservation">Anonymity Set Preservation</a> and <a class="link" href="#location">Location Neutrality</a> requirements.
-</p></div><div class="sect3" title="Referer Spoofing Options"><div class="titlepage"><div><div><h4 class="title"><a id="id2696790"></a>Referer Spoofing Options</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.refererspoof</strong></span>
+</p></div><div class="sect3" title="Referer Spoofing Options"><div class="titlepage"><div><div><h4 class="title"><a id="id2706446"></a>Referer Spoofing Options</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.refererspoof</strong></span>
</p><p>
This option variable has three values. If it is 0, "smart" referer spoofing is
enabled. If it is 1, the referer behaves as normal. If it is 2, no referer is
@@ -1059,7 +1065,7 @@ sent. The default value is 1. The smart referer spoofing is implemented by the
</p><p>
This setting also does not directly satisfy any Torbutton requirement, but
some may desire to mask their referer for general privacy concerns.
-</p></div><div class="sect3" title="Strip platform and language off of Google Search Box queries"><div class="titlepage"><div><div><h4 class="title"><a id="id2696824"></a>Strip platform and language off of Google Search Box queries</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.fix_google_srch</strong></span>
+</p></div><div class="sect3" title="Strip platform and language off of Google Search Box queries"><div class="titlepage"><div><div><h4 class="title"><a id="id2706480"></a>Strip platform and language off of Google Search Box queries</h4></div></div></div><p>Option: <span class="command"><strong>extensions.torbutton.fix_google_srch</strong></span>
</p><p>
This option causes Torbutton to use the <a class="ulink" href="https://wiki.mozilla.org/Search_Service:API" target="_top">@mozilla.org/browser/search-service;1</a>
@@ -1069,7 +1075,7 @@ platform information. This setting strips off that info while Tor is enabled.
</p><p>
This setting helps Torbutton to fulfill its <a class="link" href="#setpreservation">Anonymity Set Preservation</a> requirement.
-</p></div><div class="sect3" title="Automatically use an alternate search engine when presented with a Google Captcha"><div class="titlepage"><div><div><h4 class="title"><a id="id2696865"></a>Automatically use an alternate search engine when presented with a
+</p></div><div class="sect3" title="Automatically use an alternate search engine when presented with a Google Captcha"><div class="titlepage"><div><div><h4 class="title"><a id="id2706521"></a>Automatically use an alternate search engine when presented with a
Google Captcha</h4></div></div></div><p>Options:
</p><table border="0" summary="Simple list" class="simplelist"><tr><td><span class="command"><strong>extensions.torbutton.asked_google_captcha</strong></span></td></tr><tr><td><span class="command"><strong>extensions.torbutton.dodge_google_captcha</strong></span></td></tr><tr><td><span class="command"><strong>extensions.torbutton.google_redir_url</strong></span></td></tr></table><p>
</p><p>
@@ -1094,7 +1100,7 @@ options are duckduckgo.com, ixquick.com, bing.com, yahoo.com and scroogle.org. T
encoded in the preferences
<span class="command"><strong>extensions.torbutton.redir_url.[1-5]</strong></span>.
-</p></div><div class="sect3" title="Store SSL/CA Certs in separate jars for Tor/Non-Tor (recommended)"><div class="titlepage"><div><div><h4 class="title"><a id="id2696945"></a>Store SSL/CA Certs in separate jars for Tor/Non-Tor (recommended)</h4></div></div></div><p>Options:
+</p></div><div class="sect3" title="Store SSL/CA Certs in separate jars for Tor/Non-Tor (recommended)"><div class="titlepage"><div><div><h4 class="title"><a id="id2706601"></a>Store SSL/CA Certs in separate jars for Tor/Non-Tor (recommended)</h4></div></div></div><p>Options:
</p><table border="0" summary="Simple list" class="simplelist"><tr><td><span class="command"><strong>extensions.torbutton.jar_certs</strong></span></td></tr><tr><td><span class="command"><strong>extensions.torbutton.jar_ca_certs</strong></span></td></tr></table><p>
</p><p>
@@ -1120,38 +1126,31 @@ Separation</a> requirement of Torbutton. Unfortunately, <a class="ulink" href="h
is currently not exposed via the preferences UI.
</p></div></div></div><div class="sect1" title="6. Relevant Firefox Bugs"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="FirefoxBugs"></a>6. Relevant Firefox Bugs</h2></div></div></div><p>
-
- </p><div class="sect2" title="6.1. Bugs impacting security"><div class="titlepage"><div><div><h3 class="title"><a id="FirefoxSecurity"></a>6.1. Bugs impacting security</h3></div></div></div><p>
+Future releases of Torbutton are going to be designed around supporting only
+<a class="ulink" href="https://www.torproject.org/projects/torbrowser.html.en" target="_top">Tor
+Browser Bundle</a>, which greatly simplifies the number and nature of Firefox
+bugs we must fix. This allows us to abandon the complexities of <a class="link" href="#state">State
+Separation</a> and <a class="link" href="#isolation">Network Isolation</a> requirements
+associated with the Toggle Model.
+ </p><div class="sect2" title="6.1. Tor Browser Bugs"><div class="titlepage"><div><div><h3 class="title"><a id="TorBrowserBugs"></a>6.1. Tor Browser Bugs</h3></div></div></div><p>
+The list of Firefox patches we must create to improve privacy on the
+Tor Browser Bundle are collected in the Tor Bug Tracker under <a class="ulink" href="https://trac.torproject.org/projects/tor/ticket/2871" target="_top">ticket
+#2871</a>. These bugs are also applicable to the Toggle Model, and
+should be considered higher priority than all Toggle Model specific bugs
+below.
+ </p></div><div class="sect2" title="6.2. Toggle Model Bugs"><div class="titlepage"><div><div><h3 class="title"><a id="ToggleModelBugs"></a>6.2. Toggle Model Bugs</h3></div></div></div><p>
+In addition to the Tor Browser bugs, the Torbutton Toggle Model suffers from
+additional bugs specific to the need to isolate state across the toggle.
+Toggle model bugs are considered a lower priority than the bugs against the
+Tor Browser model.
+ </p><div class="sect3" title="Bugs impacting security"><div class="titlepage"><div><div><h4 class="title"><a id="FirefoxSecurity"></a>Bugs impacting security</h4></div></div></div><p>
Torbutton has to work around a number of Firefox bugs that impact its
security. Most of these are mentioned elsewhere in this document, but they
have also been gathered here for reference. In order of decreasing severity,
they are:
- </p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><a class="ulink" href="https://bugzilla.mozilla.org/show_bug.cgi?id=429070" target="_top">Bug 429070 - exposing
-Components.interfaces to untrusted content leaks information about installed
-extensions</a><p>
-<a class="ulink" href="http://pseudo-flaw.net/" target="_top">Gregory Fleischer</a> demonstrated at Defcon 17 that these interfaces can
-also be used to <a class="ulink" href="http://pseudo-flaw.net/tor/torbutton/fingerprint-firefox.html" target="_top">fingerprint
-Firefox down the to the minor version</a>. Note that his test has not been
-updated since 3.5.3, hence it reports 3.5.3 for more recent Firefoxes. This
-bug interferes with Torbutton's ability to satisfy its <a class="link" href="#setpreservation">Anonymity Set Preservation</a> requirement.
- </p></li><li class="listitem"><a class="ulink" href="https://bugzilla.mozilla.org/show_bug.cgi?id=418986" target="_top">Bug 418986 - window.screen
-provides a large amount of identifiable information</a><p>
-
-As <a class="link" href="#fingerprinting">mentioned above</a>, a large amount of
-information is available from <a class="ulink" href="http://developer.mozilla.org/en/docs/DOM:window.screen" target="_top">window.screen</a>.
-The most sensitive data to anonymity is actually that which is not used in
-rendering - such as desktop resolution, and window decoration size.
-Currently, there is no way to obscure this information without Javascript
-hooking. In addition, many of this same desktop and window decoration
-resolution information is available via <a class="ulink" href="https://developer.mozilla.org/En/CSS/Media_queries" target="_top">CSS Media
-Queries</a>, so perhaps some more lower-level rendering controls or
-preferences need to be provided. These issues interfere with Torbutton's
-ability to fulfill its <a class="link" href="#setpreservation">Anonymity Set
-Preservation</a> requirement.
-
- </p></li><li class="listitem"><a class="ulink" href="https://bugzilla.mozilla.org/show_bug.cgi?id=435159" target="_top">Bug 435159 -
+ </p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><a class="ulink" href="https://bugzilla.mozilla.org/show_bug.cgi?id=435159" target="_top">Bug 435159 -
nsNSSCertificateDB::DeleteCertificate has race conditions</a><p>
In Torbutton 1.2.0rc1, code was added to attempt to isolate SSL certificates
@@ -1182,20 +1181,7 @@ for any Firefox addon to actually block authentication token submission over a
TLS channel, so every addon to date (including Perspectives) is actually
providing users with notification *after* their authentication tokens have
already been compromised. This obviously needs to be fixed.
- </p></li><li class="listitem"><a class="ulink" href="https://bugzilla.mozilla.org/show_bug.cgi?id=575230" target="_top">Bug 575230 - Provide option to
-reduce precision of Date()</a><p>
-
-Currently it is possible to <a class="ulink" href="http://arstechnica.com/tech-policy/news/2010/02/firm-uses-typing-cadence-to…" target="_top">fingerprint
-users based on their typing cadence</a> using the high precision timer
-available to javascript. Using this same precision, it is possible to compute
-an identifier based upon the clock drift of the client from some nominal
-source. The latter is not much of a concern for Tor users, as the variable
-delay to load and run a page is measured on the order of seconds, but the high
-precision timer can still be used to fingerprint aspects of a browser's
-javascript engine and processor, and apparently also a user's typing cadence.
-This bug hinders Torbutton's ability to satisfy its <a class="link" href="#setpreservation">Anonymity Set Preservation</a> requirement.
-
- </p></li><li class="listitem"><a class="ulink" href="https://bugzilla.mozilla.org/show_bug.cgi?id=122752" target="_top">Bug 122752 - SOCKS
+ </p></li><li class="listitem"><a class="ulink" href="https://bugzilla.mozilla.org/show_bug.cgi?id=122752" target="_top">Bug 122752 - SOCKS
Username/Password Support</a><p>
We need <a class="ulink" href="https://developer.mozilla.org/en/nsIProxyInfo" target="_top">Firefox
APIs</a> or about:config settings to control the SOCKS Username and
@@ -1229,7 +1215,7 @@ to avoid fragmenting the anonymity set of users of foreign locales. This issue
impedes Torbutton from fully meeting its <a class="link" href="#setpreservation">Anonymity Set Preservation</a>
requirement on Firefox 3.
- </p></li></ol></div></div><div class="sect2" title="6.2. Bugs blocking functionality"><div class="titlepage"><div><div><h3 class="title"><a id="FirefoxWishlist"></a>6.2. Bugs blocking functionality</h3></div></div></div><p>
+ </p></li></ol></div></div><div class="sect3" title="Bugs blocking functionality"><div class="titlepage"><div><div><h4 class="title"><a id="FirefoxWishlist"></a>Bugs blocking functionality</h4></div></div></div><p>
The following bugs impact Torbutton and similar extensions' functionality.
</p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><a class="ulink" href="https://bugzilla.mozilla.org/show_bug.cgi?id=629820" target="_top">Bug 629820 - nsIContentPolicy::shouldLoad not
called for web request in Firefox Mobile</a><p>
@@ -1251,7 +1237,7 @@ While this doesn't have much of an effect on Torbutton, it does make writing
extensions that would like to do per-tab settings and content filters (such as
FoxyProxy) difficult to impossible to implement securely.
- </p></li></ol></div></div><div class="sect2" title="6.3. Low Priority Bugs"><div class="titlepage"><div><div><h3 class="title"><a id="FirefoxMiscBugs"></a>6.3. Low Priority Bugs</h3></div></div></div><p>
+ </p></li></ol></div></div><div class="sect3" title="Low Priority Bugs"><div class="titlepage"><div><div><h4 class="title"><a id="FirefoxMiscBugs"></a>Low Priority Bugs</h4></div></div></div><p>
The following bugs have an effect upon Torbutton, but are superseded by more
practical and more easily fixable variant bugs above; or have stable, simple
workarounds.
@@ -1302,49 +1288,7 @@ requirement and reveal a user's original IP address. Torbutton's code to
perform this workaround has been subverted at least once already by Kyle
Williams.
- </p></li><li class="listitem"><a class="ulink" href="https://bugzilla.mozilla.org/show_bug.cgi?id=419598" target="_top">Bug 419598 - 'var
-Date' is deletable</a><p>
-
-Based on Page 62 of the <a class="ulink" href="http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf" target="_top">ECMA-262
-Javascript spec</a>, it seems like it should be possible to do something
-like the following to prevent the Date object from being unmasked:
-</p><pre class="screen">
-with(window) {
- var Date = fakeDate;
- var otherVariable = 42;
-}
-
-delete window.Date; // Should fail. Instead succeeds, revealing original Date.
-delete window.otherVariable; // Fails, leaving window.otherVariable set to 42.
-</pre><p>
-
-From the ECMA-262 spec:
-
-</p><div class="blockquote"><blockquote class="blockquote">
-If the variable statement occurs inside a FunctionDeclaration, the variables
-are defined with function-local scope in that function, as described in
-s10.1.3. Otherwise, they are defined with global scope (that is, they are
-created as members of the global object, as described in 10.1.3) using
-property attributes { DontDelete }. Variables are created when the execution
-scope is entered. A Block does not define a new execution scope. Only Program
-and FunctionDeclaration produce a new scope. Variables are initialized to
-undefined when created. A variable with an Initialiser is assigned the value
-of its AssignmentExpression when the VariableStatement is executed, not when
-the variable is created.
-</blockquote></div><p>
-
-In fact, this is exactly how the with statement with a variable declaration
-behaves <span class="emphasis"><em>for all other variables other than ones that shadow system
-variables</em></span>. Some variables (such as
-<span class="command"><strong>window.screen</strong></span>, and <span class="command"><strong>window.history</strong></span>) can't
-even be shadowed in this way, and give an error about lacking a setter. If
-such shadowing were possible, it would greatly simplify the Javascript hooking
-code, which currently relies on undocumented semantics of
-<span class="command"><strong>__proto__</strong></span> to copy the original values in the event of a
-delete. This <span class="command"><strong>__proto__</strong></span> hack unfortunately does not work for
-the Date object though.
-
- </p></li></ol></div></div></div><div class="sect1" title="7. Testing"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="TestPlan"></a>7. Testing</h2></div></div></div><p>
+ </p></li></ol></div></div></div></div><div class="sect1" title="7. Testing"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="TestPlan"></a>7. Testing</h2></div></div></div><p>
The purpose of this section is to cover all the known ways that Tor browser
security can be subverted from a penetration testing perspective. The hope
@@ -1430,13 +1374,13 @@ or complete, but it is automated and could be turned into something useful
with a bit of work.
</p></li></ol></div><p>
- </p></div><div class="sect2" title="7.2. Multi-state testing"><div class="titlepage"><div><div><h3 class="title"><a id="id2698010"></a>7.2. Multi-state testing</h3></div></div></div><p>
+ </p></div><div class="sect2" title="7.2. Multi-state testing"><div class="titlepage"><div><div><h3 class="title"><a id="id2707624"></a>7.2. Multi-state testing</h3></div></div></div><p>
The tests in this section are geared towards a page that would instruct the
user to toggle their Tor state after the fetch and perform some operations:
mouseovers, stray clicks, and potentially reloads.
- </p><div class="sect3" title="Cookies and Cache Correlation"><div class="titlepage"><div><div><h4 class="title"><a id="id2698022"></a>Cookies and Cache Correlation</h4></div></div></div><p>
+ </p><div class="sect3" title="Cookies and Cache Correlation"><div class="titlepage"><div><div><h4 class="title"><a id="id2707636"></a>Cookies and Cache Correlation</h4></div></div></div><p>
The most obvious test is to set a cookie, ask the user to toggle tor, and then
have them reload the page. The cookie should no longer be set if they are
using the default Torbutton settings. In addition, it is possible to leverage
@@ -1444,11 +1388,11 @@ the cache to <a class="ulink" href="http://crypto.stanford.edu/sameorigin/safeca
identifiers</a>. The default settings of Torbutton should also protect
against these from persisting across Tor Toggle.
- </p></div><div class="sect3" title="Javascript timers and event handlers"><div class="titlepage"><div><div><h4 class="title"><a id="id2698045"></a>Javascript timers and event handlers</h4></div></div></div><p>
+ </p></div><div class="sect3" title="Javascript timers and event handlers"><div class="titlepage"><div><div><h4 class="title"><a id="id2707658"></a>Javascript timers and event handlers</h4></div></div></div><p>
Javascript can set timers and register event handlers in the hopes of fetching
URLs after the user has toggled Torbutton.
- </p></div><div class="sect3" title="CSS Popups and non-script Dynamic Content"><div class="titlepage"><div><div><h4 class="title"><a id="id2698058"></a>CSS Popups and non-script Dynamic Content</h4></div></div></div><p>
+ </p></div><div class="sect3" title="CSS Popups and non-script Dynamic Content"><div class="titlepage"><div><div><h4 class="title"><a id="id2707671"></a>CSS Popups and non-script Dynamic Content</h4></div></div></div><p>
Even if Javascript is disabled, CSS is still able to
<a class="ulink" href="http://www.tjkdesign.com/articles/css%20pop%20ups/" target="_top">create popup-like
@@ -1473,7 +1417,7 @@ these attacks, playing with them, and reporting what you find (and potentially
submitting the test cases back to be run in the standard batch of Torbutton
tests.
- </p><div class="sect3" title="Some suggested vectors to investigate"><div class="titlepage"><div><div><h4 class="title"><a id="id2698112"></a>Some suggested vectors to investigate</h4></div></div></div><p>
+ </p><div class="sect3" title="Some suggested vectors to investigate"><div class="titlepage"><div><div><h4 class="title"><a id="id2707726"></a>Some suggested vectors to investigate</h4></div></div></div><p>
</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">Strange ways to register Javascript <a class="ulink" href="http://en.wikipedia.org/wiki/DOM_Events" target="_top">events</a> and <a class="ulink" href="http://www.devshed.com/c/a/JavaScript/Using-Timers-in-JavaScript/" target="_top">timeouts</a> should
be verified to actually be ineffective after Tor has been toggled.</li><li class="listitem">Other ways to cause Javascript to be executed after
<span class="command"><strong>javascript.enabled</strong></span> has been toggled off.</li><li class="listitem">Odd ways to attempt to load plugins. Kyle Williams has had
1
0

11 Apr '11
Author: phobos
Date: 2011-04-11 00:51:45 +0000 (Mon, 11 Apr 2011)
New Revision: 24579
Modified:
website/trunk/docs/en/faq.wml
Log:
s/cerficate/certificate/
Modified: website/trunk/docs/en/faq.wml
===================================================================
--- website/trunk/docs/en/faq.wml 2011-04-11 00:36:08 UTC (rev 24578)
+++ website/trunk/docs/en/faq.wml 2011-04-11 00:51:45 UTC (rev 24579)
@@ -577,12 +577,12 @@
certificate fingerprints for Tor's various websites?</a></h3>
<p>
<pre>
- *.torproject.org SSL cerficate from Digicert:
+ *.torproject.org SSL certificate from Digicert:
The serial number is: 02:DA:41:04:89:A5:FD:A2:B5:DB:DB:F8:ED:15:0D:BE
The SHA-1 fingerprint is: a7e70f8a648fe04a9677f13eedf6f91b5f7f2e25
The SHA-256 fingerprint is: 23b854af6b96co224fd173382c520b46fa94f2d4e7238893f63ad2d783e27b4b
- blog.torproject.org SSL cerficate from RapidSSL:
+ blog.torproject.org SSL certificate from RapidSSL:
The serial number is: 00:EF:A3
The SHA-1 fingerprint is: 50af43db8438e67f305a3257d8ef198e8c42f13f
</pre>
1
0

11 Apr '11
Author: phobos
Date: 2011-04-11 00:36:08 +0000 (Mon, 11 Apr 2011)
New Revision: 24578
Modified:
website/trunk/docs/en/faq.wml
Log:
a pre will look better.
Modified: website/trunk/docs/en/faq.wml
===================================================================
--- website/trunk/docs/en/faq.wml 2011-04-11 00:34:07 UTC (rev 24577)
+++ website/trunk/docs/en/faq.wml 2011-04-11 00:36:08 UTC (rev 24578)
@@ -576,7 +576,7 @@
<h3><a class="anchor" href="#SSLcertfingerprint">What are the SSL
certificate fingerprints for Tor's various websites?</a></h3>
<p>
- <code>
+ <pre>
*.torproject.org SSL cerficate from Digicert:
The serial number is: 02:DA:41:04:89:A5:FD:A2:B5:DB:DB:F8:ED:15:0D:BE
The SHA-1 fingerprint is: a7e70f8a648fe04a9677f13eedf6f91b5f7f2e25
@@ -585,7 +585,7 @@
blog.torproject.org SSL cerficate from RapidSSL:
The serial number is: 00:EF:A3
The SHA-1 fingerprint is: 50af43db8438e67f305a3257d8ef198e8c42f13f
- </code>
+ </pre>
</p>
<hr>
1
0

r24577: {website} rename the ssl cert fingerprint anchors, fix the data. (website/trunk/docs/en)
by Andrew Lewman 11 Apr '11
by Andrew Lewman 11 Apr '11
11 Apr '11
Author: phobos
Date: 2011-04-11 00:34:07 +0000 (Mon, 11 Apr 2011)
New Revision: 24577
Modified:
website/trunk/docs/en/faq.wml
Log:
rename the ssl cert fingerprint anchors, fix the data.
Modified: website/trunk/docs/en/faq.wml
===================================================================
--- website/trunk/docs/en/faq.wml 2011-04-11 00:30:45 UTC (rev 24576)
+++ website/trunk/docs/en/faq.wml 2011-04-11 00:34:07 UTC (rev 24577)
@@ -31,7 +31,7 @@
funding?</a></li>
<li><a href="#Metrics">How many people use Tor? How many relays or
exit nodes are there?</a></li>
- <li><a href="#sslfingerprint">What are your SSL cerificate
+ <li><a href="#SSLcertfingerprint">What are your SSL cerificate
fingerprints?</a></li>
</ul>
@@ -572,10 +572,11 @@
href="https://metrics.torproject.org/">Tor Metrics Portal</a>.</p>
<hr>
- <a id="sslfingerprint"></a>
- <h3><a class="anchor" href="#sslfingerprint">What are the SSL
+ <a id="SSLcertfingerprint"></a>
+ <h3><a class="anchor" href="#SSLcertfingerprint">What are the SSL
certificate fingerprints for Tor's various websites?</a></h3>
<p>
+ <code>
*.torproject.org SSL cerficate from Digicert:
The serial number is: 02:DA:41:04:89:A5:FD:A2:B5:DB:DB:F8:ED:15:0D:BE
The SHA-1 fingerprint is: a7e70f8a648fe04a9677f13eedf6f91b5f7f2e25
@@ -584,6 +585,7 @@
blog.torproject.org SSL cerficate from RapidSSL:
The serial number is: 00:EF:A3
The SHA-1 fingerprint is: 50af43db8438e67f305a3257d8ef198e8c42f13f
+ </code>
</p>
<hr>
1
0

r24576: {website} update the faq with the ssl cert info from #2368. (website/trunk/docs/en)
by Andrew Lewman 11 Apr '11
by Andrew Lewman 11 Apr '11
11 Apr '11
Author: phobos
Date: 2011-04-11 00:30:45 +0000 (Mon, 11 Apr 2011)
New Revision: 24576
Modified:
website/trunk/docs/en/faq.wml
Log:
update the faq with the ssl cert info from #2368.
Modified: website/trunk/docs/en/faq.wml
===================================================================
--- website/trunk/docs/en/faq.wml 2011-04-11 00:07:18 UTC (rev 24575)
+++ website/trunk/docs/en/faq.wml 2011-04-11 00:30:45 UTC (rev 24576)
@@ -31,6 +31,8 @@
funding?</a></li>
<li><a href="#Metrics">How many people use Tor? How many relays or
exit nodes are there?</a></li>
+ <li><a href="#sslfingerprint">What are your SSL cerificate
+ fingerprints?</a></li>
</ul>
<p>Compilation and Installation:</p>
@@ -570,6 +572,21 @@
href="https://metrics.torproject.org/">Tor Metrics Portal</a>.</p>
<hr>
+ <a id="sslfingerprint"></a>
+ <h3><a class="anchor" href="#sslfingerprint">What are the SSL
+certificate fingerprints for Tor's various websites?</a></h3>
+ <p>
+ *.torproject.org SSL cerficate from Digicert:
+ The serial number is: 02:DA:41:04:89:A5:FD:A2:B5:DB:DB:F8:ED:15:0D:BE
+ The SHA-1 fingerprint is: a7e70f8a648fe04a9677f13eedf6f91b5f7f2e25
+ The SHA-256 fingerprint is: 23b854af6b96co224fd173382c520b46fa94f2d4e7238893f63ad2d783e27b4b
+
+ blog.torproject.org SSL cerficate from RapidSSL:
+ The serial number is: 00:EF:A3
+ The SHA-1 fingerprint is: 50af43db8438e67f305a3257d8ef198e8c42f13f
+ </p>
+ <hr>
+
<a id="HowUninstallTor"></a>
<h3><a class="anchor" href="#HowUninstallTor">How do I uninstall Tor?</a></h3>
1
0

r24575: {website} update the mirrors-table with clean mirrors (website/trunk/include)
by Andrew Lewman 11 Apr '11
by Andrew Lewman 11 Apr '11
11 Apr '11
Author: phobos
Date: 2011-04-11 00:07:18 +0000 (Mon, 11 Apr 2011)
New Revision: 24575
Modified:
website/trunk/include/mirrors-table.wmi
Log:
update the mirrors-table with clean mirrors
Modified: website/trunk/include/mirrors-table.wmi
===================================================================
--- website/trunk/include/mirrors-table.wmi 2011-04-11 00:05:36 UTC (rev 24574)
+++ website/trunk/include/mirrors-table.wmi 2011-04-11 00:07:18 UTC (rev 24575)
@@ -154,6 +154,23 @@
<tr>
+ <td>HU</td>
+
+ <td>Unknown</td>
+
+ <td>Up to date</td>
+
+ <td> - </td>
+ <td><a href="http://mirror.tor.hu/dist">http</a></td>
+ <td><a href="http://mirror.tor.hu/">http</a></td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+</tr>
+
+<tr>
+
<td>DE</td>
<td>torservers</td>
@@ -358,40 +375,6 @@
<tr>
- <td>UK</td>
-
- <td>tomyn</td>
-
- <td>Unknown</td>
-
- <td><a href="ftp://tor.tomyn.com">ftp</a></td>
- <td><a href="http://tor.tomyn.com/dist">http</a></td>
- <td><a href="http://tor.tomyn.com">http</a></td>
- <td><a href="https://tor.tomyn.com/dist">https</a></td>
- <td><a href="https://tor.tomyn.com">https</a></td>
- <td> - </td>
- <td> - </td>
-</tr>
-
-<tr>
-
- <td>CH</td>
-
- <td>Boinc</td>
-
- <td>Unknown</td>
-
- <td> - </td>
- <td><a href="http://tor.boinc.ch/dist/">http</a></td>
- <td><a href="http://tor.boinc.ch/">http</a></td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
-</tr>
-
-<tr>
-
<td>IS</td>
<td>tor</td>
@@ -426,40 +409,6 @@
<tr>
- <td>HU</td>
-
- <td>Unknown</td>
-
- <td>Unknown</td>
-
- <td> - </td>
- <td> - </td>
- <td><a href="http://tor.hu/">http</a></td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
-</tr>
-
-<tr>
-
- <td>RO</td>
-
- <td>mirrors.sykotik.org</td>
-
- <td>Unknown</td>
-
- <td><a href="ftp://mirrors.sykotik.org/pub/tor/">ftp</a></td>
- <td><a href="http://mirrors.sykotik.org/pub/tor/">http</a></td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
-</tr>
-
-<tr>
-
<td>US</td>
<td>TheOnionRouter</td>
@@ -477,23 +426,6 @@
<tr>
- <td>NO</td>
-
- <td>Meulie</td>
-
- <td>Unknown</td>
-
- <td> - </td>
- <td><a href="http://tor.meulie.net/">http</a></td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
-</tr>
-
-<tr>
-
<td>INT</td>
<td>CoralCDN</td>
@@ -508,20 +440,3 @@
<td> - </td>
<td> - </td>
</tr>
-
-<tr>
-
- <td>DE</td>
-
- <td>Spline</td>
-
- <td>Unknown</td>
-
- <td> - </td>
- <td><a href="http://rem.spline.de/tor/">http</a></td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
-</tr>
1
0

r24574: {website} purge the dead mirrors that haven't worked in a month. (in website/trunk: . include)
by Andrew Lewman 11 Apr '11
by Andrew Lewman 11 Apr '11
11 Apr '11
Author: phobos
Date: 2011-04-11 00:05:36 +0000 (Mon, 11 Apr 2011)
New Revision: 24574
Modified:
website/trunk/include/mirrors-table.wmi
website/trunk/update-mirrors.pl
Log:
purge the dead mirrors that haven't worked in a month.
Modified: website/trunk/include/mirrors-table.wmi
===================================================================
--- website/trunk/include/mirrors-table.wmi 2011-04-10 23:56:42 UTC (rev 24573)
+++ website/trunk/include/mirrors-table.wmi 2011-04-11 00:05:36 UTC (rev 24574)
@@ -35,15 +35,15 @@
<tr>
- <td>US</td>
+ <td>AT</td>
- <td>searchprivate</td>
+ <td>cyberarmy</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://tor.searchprivate.com/dist">http</a></td>
- <td><a href="http://tor.searchprivate.com">http</a></td>
+ <td><a href="http://tor.cyberarmy.at/dist">http</a></td>
+ <td><a href="http://tor.cyberarmy.at">http</a></td>
<td> - </td>
<td> - </td>
<td> - </td>
@@ -52,15 +52,15 @@
<tr>
- <td>FR</td>
+ <td>US</td>
- <td>LazyTiger</td>
+ <td>searchprivate</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://tor.taiga-san.net/dist">http</a></td>
- <td><a href="http://tor.taiga-san.net/">http</a></td>
+ <td><a href="http://tor.searchprivate.com/dist">http</a></td>
+ <td><a href="http://tor.searchprivate.com">http</a></td>
<td> - </td>
<td> - </td>
<td> - </td>
@@ -190,6 +190,23 @@
<td>US</td>
+ <td>NW Linux</td>
+
+ <td>Up to date</td>
+
+ <td> - </td>
+ <td><a href="http://torproject.nwlinux.us/dist">http</a></td>
+ <td><a href="http://torproject.nwlinux.us">http</a></td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+</tr>
+
+<tr>
+
+ <td>US</td>
+
<td>Xpdm</td>
<td>Up to date</td>
@@ -207,13 +224,13 @@
<td>US</td>
- <td>NW Linux</td>
+ <td>AskApache</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://torproject.nwlinux.us/dist">http</a></td>
- <td><a href="http://torproject.nwlinux.us">http</a></td>
+ <td><a href="http://tor.askapache.com/dist/">http</a></td>
+ <td><a href="http://tor.askapache.com/">http</a></td>
<td> - </td>
<td> - </td>
<td> - </td>
@@ -222,15 +239,15 @@
<tr>
- <td>SE</td>
+ <td>FR</td>
- <td>homosu</td>
+ <td>LazyTiger</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://tor.homosu.net/dist">http</a></td>
- <td><a href="http://tor.homosu.net/">http</a></td>
+ <td><a href="http://tor.taiga-san.net/dist">http</a></td>
+ <td><a href="http://tor.taiga-san.net/">http</a></td>
<td> - </td>
<td> - </td>
<td> - </td>
@@ -239,36 +256,36 @@
<tr>
- <td>DE</td>
+ <td>SE</td>
- <td>[[:bbs:]]</td>
+ <td>homosu</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://tor.blingblingsquad.net/dist">http</a></td>
- <td><a href="http://tor.blingblingsquad.net/">http</a></td>
- <td><a href="https://tor.blingblingsquad.net/dist">https</a></td>
- <td><a href="https://tor.blingblingsquad.net/">https</a></td>
+ <td><a href="http://tor.homosu.net/dist">http</a></td>
+ <td><a href="http://tor.homosu.net/">http</a></td>
<td> - </td>
<td> - </td>
+ <td> - </td>
+ <td> - </td>
</tr>
<tr>
- <td>US</td>
+ <td>DE</td>
- <td>AskApache</td>
+ <td>[[:bbs:]]</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://tor.askapache.com/dist/">http</a></td>
- <td><a href="http://tor.askapache.com/">http</a></td>
+ <td><a href="http://tor.blingblingsquad.net/dist">http</a></td>
+ <td><a href="http://tor.blingblingsquad.net/">http</a></td>
+ <td><a href="https://tor.blingblingsquad.net/dist">https</a></td>
+ <td><a href="https://tor.blingblingsquad.net/">https</a></td>
<td> - </td>
<td> - </td>
- <td> - </td>
- <td> - </td>
</tr>
<tr>
@@ -277,7 +294,7 @@
<td>India Tor Fans</td>
- <td>Out of date</td>
+ <td>Up to date</td>
<td> - </td>
<td><a href="http://www.torproject.org.in/dist/">http</a></td>
@@ -294,7 +311,7 @@
<td>Ninjas</td>
- <td>Out of date</td>
+ <td>Up to date</td>
<td> - </td>
<td><a href="http://irani-tor.ath.cx/dist/">http</a></td>
@@ -379,7 +396,7 @@
<td>tor</td>
- <td>Out of date</td>
+ <td>Up to date</td>
<td> - </td>
<td><a href="http://torproject.is/dist">http</a></td>
@@ -443,23 +460,6 @@
<tr>
- <td>PT</td>
-
- <td>5ª Coluna</td>
-
- <td>Unknown</td>
-
- <td> - </td>
- <td><a href="http://tor-www.5coluna.com/dist/">http</a></td>
- <td><a href="http://tor-www.5coluna.com">http</a></td>
- <td><a href="https://tor-www.5coluna.com/dist/">https</a></td>
- <td><a href="https://tor-www.5coluna.com">https</a></td>
- <td> - </td>
- <td> - </td>
-</tr>
-
-<tr>
-
<td>US</td>
<td>TheOnionRouter</td>
Modified: website/trunk/update-mirrors.pl
===================================================================
--- website/trunk/update-mirrors.pl 2011-04-10 23:56:42 UTC (rev 24573)
+++ website/trunk/update-mirrors.pl 2011-04-11 00:05:36 UTC (rev 24574)
@@ -124,23 +124,6 @@
updateDate => "Unknown",
},
- mirror002 => {
- adminContact => "",
- orgName => "Boinc",
- isoCC => "CH",
- subRegion => "",
- region => "Europe",
- ipv4 => "True",
- ipv6 => "False",
- loadBalanced => "Unknown",
- httpWebsiteMirror => "http://tor.boinc.ch/",
- ftpWebsiteMirror => "",
- rsyncWebsiteMirror => "",
- httpDistMirror => "http://tor.boinc.ch/dist/",
- rsyncDistMirror => "",
- updateDate => "Unknown",
- },
-
mirror003 => {
adminContact => "citizen428 AT gmail DOT com",
orgName => "[[:bbs:]]",
@@ -160,23 +143,6 @@
updateDate => "Unknown",
},
- mirror005 => {
- adminContact => "contact AT algorithmus DOT com",
- orgName => "Spline",
- isoCC => "DE",
- subRegion => "FU",
- region => "Europe",
- ipv4 => "True",
- ipv6 => "False",
- loadBalanced => "Unknown",
- httpWebsiteMirror => "",
- ftpWebsiteMirror => "",
- rsyncWebsiteMirror => "",
- httpDistMirror => "http://rem.spline.de/tor/",
- rsyncDistMirror => "",
- updateDate => "Unknown",
- },
-
mirror006 => {
adminContact => "BarkerJr AT barkerjr DOT net",
orgName => "BarkerJr",
@@ -282,23 +248,6 @@
updateDate => "Unknown",
},
- mirror012 => {
- adminContact => "evert AT meulie DOT net",
- orgName => "Meulie",
- isoCC => "NO",
- subRegion => "",
- region => "Europe",
- ipv4 => "True",
- ipv6 => "False",
- loadBalanced => "Unknown",
- httpWebsiteMirror => "",
- rsyncWebsiteMirror => "",
- ftpWebsiteMirror => "",
- httpDistMirror => "http://tor.meulie.net/",
- rsyncDistMirror => "",
- updateDate => "Unknown",
- },
-
mirror013 => {
adminContact => "hostmaster AT zombiewerks DOT com",
orgName => "TheOnionRouter",
@@ -345,11 +294,11 @@
ipv4 => "True",
ipv6 => "False",
loadBalanced => "No",
- httpWebsiteMirror => "http://tor.hu/",
+ httpWebsiteMirror => "http://mirror.tor.hu/",
httpsWebsiteMirror => "",
rsyncWebsiteMirror => "",
ftpWebsiteMirror => "",
- httpDistMirror => "",
+ httpDistMirror => "http://mirror.tor.hu/dist",
httpsDistMirror => "",
rsyncDistMirror => "",
hiddenServiceMirror => "",
@@ -513,44 +462,6 @@
hiddenServiceMirror => "",
},
- mirror026 => {
- adminContact => "me_ at tomyn dot com",
- orgName => "tomyn",
- isoCC => "UK",
- subRegion => "",
- region => "UK",
- ipv4 => "True",
- ipv6 => "False",
- loadBalanced => "No",
- httpWebsiteMirror => "http://tor.tomyn.com",
- httpsWebsiteMirror => "https://tor.tomyn.com",
- rsyncWebsiteMirror => "",
- ftpWebsiteMirror => "ftp://tor.tomyn.com",
- httpDistMirror => "http://tor.tomyn.com/dist",
- httpsDistMirror => "https://tor.tomyn.com/dist",
- rsyncDistMirror => "",
- hiddenServiceMirror => "",
- },
-
- mirror027 => {
- adminContact => "",
- orgName => "mirrors.sykotik.org",
- isoCC => "RO",
- subRegion => "",
- region => "RO",
- ipv4 => "True",
- ipv6 => "False",
- loadBalanced => "No",
- httpWebsiteMirror => "",
- httpsWebsiteMirror => "",
- rsyncWebsiteMirror => "",
- ftpWebsiteMirror => "ftp://mirrors.sykotik.org/pub/tor/",
- httpDistMirror => "http://mirrors.sykotik.org/pub/tor/",
- httpsDistMirror => "",
- rsyncDistMirror => "",
- hiddenServiceMirror => "",
- },
-
mirror028 => {
adminContact => "",
orgName => "NW Linux",
1
0
Author: phobos
Date: 2011-04-10 23:56:42 +0000 (Sun, 10 Apr 2011)
New Revision: 24573
Modified:
website/trunk/update-mirrors.pl
Log:
5coluna is down.
Modified: website/trunk/update-mirrors.pl
===================================================================
--- website/trunk/update-mirrors.pl 2011-04-07 14:20:26 UTC (rev 24572)
+++ website/trunk/update-mirrors.pl 2011-04-10 23:56:42 UTC (rev 24573)
@@ -552,25 +552,6 @@
},
mirror028 => {
- adminContact => "gouki",
- orgName => "5ª Coluna",
- isoCC => "PT",
- subRegion => "",
- region => "PT",
- ipv4 => "True",
- ipv6 => "False",
- loadBalanced => "No",
- httpWebsiteMirror => "http://tor-www.5coluna.com",
- httpsWebsiteMirror => "https://tor-www.5coluna.com",
- rsyncWebsiteMirror => "",
- ftpWebsiteMirror => "",
- httpDistMirror => "http://tor-www.5coluna.com/dist/",
- httpsDistMirror => "https://tor-www.5coluna.com/dist/",
- rsyncDistMirror => "",
- hiddenServiceMirror => "",
- },
-
- mirror029 => {
adminContact => "",
orgName => "NW Linux",
isoCC => "US",
@@ -588,7 +569,7 @@
rsyncDistMirror => "",
hiddenServiceMirror => "",
},
- mirror030 => {
+ mirror029 => {
adminContact => "",
orgName => "LazyTiger",
isoCC => "FR",
@@ -606,7 +587,7 @@
rsyncDistMirror => "",
hiddenServiceMirror => "",
},
- mirror031 => {
+ mirror030 => {
adminContact => "",
orgName => "searchprivate",
isoCC => "US",
@@ -624,7 +605,7 @@
rsyncDistMirror => "",
hiddenServiceMirror => "",
},
- mirror032 => {
+ mirror031 => {
adminContact => "",
orgName => "cyberarmy",
isoCC => "AT",
1
0

[vidalia/master] Update CHANGELOG and verion in CMakeLists for the 0.2.12 release
by chiiph@torproject.org 11 Apr '11
by chiiph@torproject.org 11 Apr '11
11 Apr '11
commit cd2226d3c1fcff461f9f55bd4328b6aa8b12128e
Author: Tomas Touceda <chiiph(a)gentoo.org>
Date: Sun Apr 10 15:27:45 2011 -0300
Update CHANGELOG and verion in CMakeLists for the 0.2.12 release
Thanks Roger and Robert for your reviews on the changelog
---
CHANGELOG | 44 ++++++++++++++++++++++++++++++++++++++++++++
CMakeLists.txt | 4 ++--
2 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index de9189e..64c301f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,47 @@
+0.2.12 10-Apr-2011
+ o Vidalia's SVN repository has been migrated to Git. All branches but
+ master have been archived for later review, since SVN trunk had changed
+ significantly; they should be reviewed later to determine whether
+ they can and should still be merged. All \version $Id$ headers have been
+ removed since Git does not support $Id$.
+ o As part of the move, Vidalia's Trac is now at:
+ https://trac.torproject.org/
+ All Trac numbers in Vidalia 0.2.12 and beyond refer to the new Trac
+ entries. The old Trac is archived for posterity at:
+ https://trac-vidalia.torproject.org/projects/vidalia
+ o Add support for Tor's ControlSocket as an alternative to ControlPort. It
+ can be used for Linux maintainers to build a better default interaction
+ between Tor and Vidalia by just setting the right permissions and file
+ owner on the socket file for the connection. Using ControlSocket means
+ you don't need to worry about authentication methods with ControlPort.
+ Resolves bug 2091.
+ o Add a way to edit arbitrary torrc entries while Tor is running. Now
+ Vidalia users have more flexibility for configuring Tor. This change
+ doesn't replace editing torrc directly, because on some systems
+ (like Debian) Tor can't write to its torrc file. Resolves bug 2083.
+ o Remove Vidalia's direct dependency on OpenSSL. This dependency had
+ caused Vidalia to fail to run on FreeBSD (due to a bug in the FreeBSD
+ ports collection) and Fedora 14 (due to an incompatibility between
+ OpenSSL and Fedora's SELinux configuration). Resolves bug 2287 and
+ 2611.
+ o Restore compatibility with Windows 2000. An update to the MiniUPnPc
+ library had introduced an unnecessary dependency on a system library
+ not included in Windows 2000. Fixes bug 2612.
+ o Fix how the advanced message log window displays message updates when
+ messages are coming in too quickly, for example when you're listening
+ to debug-level messages from Tor. Fixes bug 2093.
+ o Add a what's this? link to the bridge option to explain in a more verbose
+ fashion what being a bridge involves. Resolves bug 1995.
+ o Prompt users to restart Tor after changing the path to torrc. Fixes bug
+ 2086.
+ o Disable the directory port configuration field when configuring a
+ bridge. A bridge does not need to operate a separate directory port,
+ and operating one can make a bridge easier to detect. Fixes bug 2431.
+ o When Vidalia asks Tor for a bridge's usage history before anyone has
+ used it, correctly report that no clients have used the bridge recently.
+ Previously, it would incorrectly warn that it was unable to retrieve the
+ bridge's usage history. Fixes bug 2186.
+
0.2.10 26-Aug-2010
o Drop remote GeoIP lookups. Instead, the default behavior now is to use
the country-level GeoIP database that ships with Tor to map an IP
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0baea56..03c6b5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,8 +13,8 @@
set(VER_MAJOR "0")
set(VER_MINOR "2")
-set(VER_PATCH "11")
-set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}-svn")
+set(VER_PATCH "12")
+set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}")
message(STATUS "Configuring Vidalia ${VERSION}")
project(Vidalia)
1
0

[vidalia/master] Remove \version $Id$ header from .h and .cpp files
by chiiph@torproject.org 11 Apr '11
by chiiph@torproject.org 11 Apr '11
11 Apr '11
commit d6ef5205f9fdd0fc8faf425a30ecc4341cb42ca4
Author: Tomas Touceda <chiiph(a)gentoo.org>
Date: Sun Apr 10 15:24:27 2011 -0300
Remove \version $Id$ header from .h and .cpp files
Git doesn't handle Id on files like SVN, so it's useless now.
---
src/common/Log.cpp | 1 -
src/common/Log.h | 1 -
src/common/TorSocket.cpp | 1 -
src/common/TorSocket.h | 1 -
src/common/ZlibByteArray.cpp | 1 -
src/common/ZlibByteArray.h | 1 -
src/common/crypto.cpp | 1 -
src/common/crypto.h | 1 -
src/common/file.cpp | 1 -
src/common/file.h | 1 -
src/common/html.cpp | 1 -
src/common/html.h | 1 -
src/common/net.cpp | 1 -
src/common/net.h | 1 -
src/common/procutil.cpp | 1 -
src/common/procutil.h | 1 -
src/common/stringutil.cpp | 1 -
src/common/stringutil.h | 1 -
src/common/win32.cpp | 1 -
src/common/win32.h | 1 -
src/crashreporter/CrashReportDialog.cpp | 1 -
src/crashreporter/CrashReportDialog.h | 1 -
src/crashreporter/CrashReportUploader.cpp | 1 -
src/crashreporter/CrashReportUploader.h | 1 -
src/crashreporter/UploadProgressDialog.cpp | 1 -
src/crashreporter/UploadProgressDialog.h | 1 -
src/crashreporter/main.cpp | 1 -
src/torcontrol/AddressMap.cpp | 1 -
src/torcontrol/AddressMap.h | 1 -
src/torcontrol/BootstrapStatus.cpp | 1 -
src/torcontrol/BootstrapStatus.h | 1 -
src/torcontrol/Circuit.cpp | 1 -
src/torcontrol/Circuit.h | 1 -
src/torcontrol/ControlCommand.cpp | 1 -
src/torcontrol/ControlCommand.h | 1 -
src/torcontrol/ControlConnection.cpp | 1 -
src/torcontrol/ControlConnection.h | 1 -
src/torcontrol/ControlMethod.cpp | 1 -
src/torcontrol/ControlMethod.h | 1 -
src/torcontrol/ControlReply.cpp | 1 -
src/torcontrol/ControlReply.h | 1 -
src/torcontrol/ControlSocket.cpp | 1 -
src/torcontrol/ControlSocket.h | 1 -
src/torcontrol/LogEvent.cpp | 1 -
src/torcontrol/LogEvent.h | 1 -
src/torcontrol/ProtocolInfo.cpp | 1 -
src/torcontrol/ProtocolInfo.h | 1 -
src/torcontrol/ReplyLine.cpp | 1 -
src/torcontrol/ReplyLine.h | 1 -
src/torcontrol/RouterDescriptor.cpp | 1 -
src/torcontrol/RouterDescriptor.h | 1 -
src/torcontrol/RouterStatus.cpp | 1 -
src/torcontrol/RouterStatus.h | 1 -
src/torcontrol/SendCommandEvent.cpp | 1 -
src/torcontrol/SendCommandEvent.h | 1 -
src/torcontrol/Stream.cpp | 1 -
src/torcontrol/Stream.h | 1 -
src/torcontrol/TorControl.cpp | 1 -
src/torcontrol/TorControl.h | 1 -
src/torcontrol/TorEvents.cpp | 1 -
src/torcontrol/TorEvents.h | 1 -
src/torcontrol/TorProcess.cpp | 1 -
src/torcontrol/TorProcess.h | 1 -
src/torcontrol/TorService.cpp | 1 -
src/torcontrol/TorService.h | 1 -
src/torcontrol/TorSignal.cpp | 1 -
src/torcontrol/TorSignal.h | 1 -
src/torcontrol/tcglobal.cpp | 1 -
src/torcontrol/tcglobal.h | 1 -
src/vidalia/ControlPasswordInputDialog.cpp | 1 -
src/vidalia/ControlPasswordInputDialog.h | 1 -
src/vidalia/CrashReporter.cpp | 1 -
src/vidalia/CrashReporter.h | 1 -
src/vidalia/HelperProcess.cpp | 1 -
src/vidalia/HelperProcess.h | 1 -
src/vidalia/LanguageSupport.cpp | 1 -
src/vidalia/LanguageSupport.h | 1 -
src/vidalia/MainWindow.cpp | 1 -
src/vidalia/MainWindow.h | 1 -
src/vidalia/PackageInfo.cpp | 1 -
src/vidalia/PackageInfo.h | 1 -
src/vidalia/UpdatesAvailableDialog.cpp | 1 -
src/vidalia/UpdatesAvailableDialog.h | 1 -
src/vidalia/VClickLabel.cpp | 1 -
src/vidalia/VClickLabel.h | 1 -
src/vidalia/VMessageBox.cpp | 1 -
src/vidalia/VMessageBox.h | 1 -
src/vidalia/Vidalia.cpp | 1 -
src/vidalia/Vidalia.h | 1 -
src/vidalia/VidaliaWindow.cpp | 1 -
src/vidalia/VidaliaWindow.h | 1 -
src/vidalia/about/AboutDialog.cpp | 1 -
src/vidalia/about/AboutDialog.h | 1 -
src/vidalia/about/LicenseDialog.cpp | 1 -
src/vidalia/about/LicenseDialog.h | 1 -
src/vidalia/bwgraph/BandwidthGraph.cpp | 1 -
src/vidalia/bwgraph/BandwidthGraph.h | 1 -
src/vidalia/bwgraph/GraphFrame.cpp | 1 -
src/vidalia/bwgraph/GraphFrame.h | 1 -
src/vidalia/config/AbstractTorSettings.cpp | 1 -
src/vidalia/config/AbstractTorSettings.h | 1 -
src/vidalia/config/AdvancedPage.cpp | 1 -
src/vidalia/config/AdvancedPage.h | 1 -
src/vidalia/config/AppearancePage.cpp | 1 -
src/vidalia/config/AppearancePage.h | 1 -
src/vidalia/config/BridgeDownloader.cpp | 1 -
src/vidalia/config/BridgeDownloader.h | 1 -
.../config/BridgeDownloaderProgressDialog.cpp | 1 -
.../config/BridgeDownloaderProgressDialog.h | 1 -
src/vidalia/config/BridgeUsageDialog.cpp | 1 -
src/vidalia/config/BridgeUsageDialog.h | 1 -
src/vidalia/config/ConfigDialog.cpp | 1 -
src/vidalia/config/ConfigDialog.h | 1 -
src/vidalia/config/ConfigPage.h | 1 -
src/vidalia/config/ConfigPageStack.cpp | 1 -
src/vidalia/config/ConfigPageStack.h | 1 -
src/vidalia/config/DomainValidator.cpp | 1 -
src/vidalia/config/DomainValidator.h | 1 -
src/vidalia/config/ExitPolicy.cpp | 1 -
src/vidalia/config/ExitPolicy.h | 1 -
src/vidalia/config/GeneralPage.cpp | 1 -
src/vidalia/config/GeneralPage.h | 1 -
src/vidalia/config/IpValidator.cpp | 1 -
src/vidalia/config/IpValidator.h | 1 -
src/vidalia/config/Local8BitStringValidator.cpp | 1 -
src/vidalia/config/Local8BitStringValidator.h | 1 -
src/vidalia/config/NetworkPage.cpp | 1 -
src/vidalia/config/NetworkPage.h | 1 -
src/vidalia/config/NetworkSettings.cpp | 1 -
src/vidalia/config/NetworkSettings.h | 1 -
src/vidalia/config/NicknameValidator.cpp | 1 -
src/vidalia/config/NicknameValidator.h | 1 -
src/vidalia/config/Policy.cpp | 1 -
src/vidalia/config/Policy.h | 1 -
src/vidalia/config/PortValidator.cpp | 1 -
src/vidalia/config/PortValidator.h | 1 -
src/vidalia/config/ServerPage.cpp | 1 -
src/vidalia/config/ServerPage.h | 1 -
src/vidalia/config/ServerSettings.cpp | 1 -
src/vidalia/config/ServerSettings.h | 1 -
src/vidalia/config/TorSettings.cpp | 1 -
src/vidalia/config/TorSettings.h | 1 -
src/vidalia/config/TorrcDialog.cpp | 1 -
src/vidalia/config/TorrcDialog.h | 1 -
src/vidalia/config/UPNPControl.cpp | 1 -
src/vidalia/config/UPNPControl.h | 1 -
src/vidalia/config/UPNPControlThread.cpp | 1 -
src/vidalia/config/UPNPControlThread.h | 1 -
src/vidalia/config/UPNPTestDialog.cpp | 1 -
src/vidalia/config/UPNPTestDialog.h | 1 -
src/vidalia/config/VSettings.cpp | 1 -
src/vidalia/config/VSettings.h | 1 -
src/vidalia/config/VidaliaSettings.cpp | 1 -
src/vidalia/config/VidaliaSettings.h | 1 -
src/vidalia/help/browser/HelpBrowser.cpp | 1 -
src/vidalia/help/browser/HelpBrowser.h | 1 -
src/vidalia/help/browser/HelpTextBrowser.cpp | 1 -
src/vidalia/help/browser/HelpTextBrowser.h | 1 -
src/vidalia/log/LogFile.cpp | 1 -
src/vidalia/log/LogFile.h | 1 -
src/vidalia/log/LogHeaderView.cpp | 1 -
src/vidalia/log/LogHeaderView.h | 1 -
src/vidalia/log/LogMessageColumnDelegate.cpp | 1 -
src/vidalia/log/LogMessageColumnDelegate.h | 1 -
src/vidalia/log/LogTreeItem.cpp | 1 -
src/vidalia/log/LogTreeItem.h | 1 -
src/vidalia/log/LogTreeWidget.cpp | 1 -
src/vidalia/log/LogTreeWidget.h | 1 -
src/vidalia/log/MessageLog.cpp | 1 -
src/vidalia/log/MessageLog.h | 1 -
src/vidalia/log/StatusEventItem.cpp | 1 -
src/vidalia/log/StatusEventItem.h | 1 -
src/vidalia/log/StatusEventItemDelegate.cpp | 1 -
src/vidalia/log/StatusEventItemDelegate.h | 1 -
src/vidalia/log/StatusEventWidget.cpp | 1 -
src/vidalia/log/StatusEventWidget.h | 1 -
src/vidalia/main.cpp | 1 -
src/vidalia/network/CircuitItem.cpp | 1 -
src/vidalia/network/CircuitItem.h | 1 -
src/vidalia/network/CircuitListWidget.cpp | 1 -
src/vidalia/network/CircuitListWidget.h | 1 -
src/vidalia/network/CountryInfo.cpp | 1 -
src/vidalia/network/CountryInfo.h | 1 -
src/vidalia/network/GeoIpDatabase.cpp | 1 -
src/vidalia/network/GeoIpDatabase.h | 1 -
src/vidalia/network/GeoIpRecord.cpp | 1 -
src/vidalia/network/GeoIpRecord.h | 1 -
src/vidalia/network/GeoIpResolver.cpp | 1 -
src/vidalia/network/GeoIpResolver.h | 1 -
src/vidalia/network/NetViewer.cpp | 1 -
src/vidalia/network/NetViewer.h | 1 -
src/vidalia/network/RouterDescriptorView.cpp | 1 -
src/vidalia/network/RouterDescriptorView.h | 1 -
src/vidalia/network/RouterInfoDialog.cpp | 1 -
src/vidalia/network/RouterInfoDialog.h | 1 -
src/vidalia/network/RouterListItem.cpp | 1 -
src/vidalia/network/RouterListItem.h | 1 -
src/vidalia/network/RouterListWidget.cpp | 1 -
src/vidalia/network/RouterListWidget.h | 1 -
src/vidalia/network/StreamItem.cpp | 1 -
src/vidalia/network/StreamItem.h | 1 -
src/vidalia/network/TorMapImageView.cpp | 1 -
src/vidalia/network/TorMapImageView.h | 1 -
src/vidalia/network/TorMapWidget.cpp | 1 -
src/vidalia/network/TorMapWidget.h | 1 -
src/vidalia/network/TorMapWidgetPopupMenu.cpp | 1 -
src/vidalia/network/TorMapWidgetPopupMenu.h | 1 -
src/vidalia/network/ZImageView.cpp | 1 -
src/vidalia/network/ZImageView.h | 1 -
209 files changed, 0 insertions(+), 209 deletions(-)
diff --git a/src/common/Log.cpp b/src/common/Log.cpp
index 4ec4df0..d38cb9e 100644
--- a/src/common/Log.cpp
+++ b/src/common/Log.cpp
@@ -10,7 +10,6 @@
/*
** \file Log.cpp
-** \version $Id$
** \brief Debug message logging
*/
diff --git a/src/common/Log.h b/src/common/Log.h
index cde9885..592b597 100644
--- a/src/common/Log.h
+++ b/src/common/Log.h
@@ -10,7 +10,6 @@
/*
** \file Log.h
-** \version $Id$
** \brief Debug message logging
*/
diff --git a/src/common/TorSocket.cpp b/src/common/TorSocket.cpp
index b2f70f4..10651a1 100644
--- a/src/common/TorSocket.cpp
+++ b/src/common/TorSocket.cpp
@@ -10,7 +10,6 @@
/*
** \file TorSocket.cpp
-** \version $Id$
** \brief A QTcpSocket that makes requests over Tor
*/
diff --git a/src/common/TorSocket.h b/src/common/TorSocket.h
index 96c50d4..46c2581 100644
--- a/src/common/TorSocket.h
+++ b/src/common/TorSocket.h
@@ -10,7 +10,6 @@
/*
** \file TorSocket.h
-** \version $Id$
** \brief A QTcpSocket that makes requests over Tor
*/
diff --git a/src/common/ZlibByteArray.cpp b/src/common/ZlibByteArray.cpp
index ead8065..fc6cada 100644
--- a/src/common/ZlibByteArray.cpp
+++ b/src/common/ZlibByteArray.cpp
@@ -46,7 +46,6 @@
/*
** \file ZlibByteArray.cpp
-** \version $Id$
** \brief Wrapper around QByteArray that adds compression capabilities
*/
diff --git a/src/common/ZlibByteArray.h b/src/common/ZlibByteArray.h
index 259838f..bd6f6fe 100644
--- a/src/common/ZlibByteArray.h
+++ b/src/common/ZlibByteArray.h
@@ -46,7 +46,6 @@
/*
** \file ZlibByteArray.h
-** \version $Id$
** \brief Wrapper around QByteArray that adds compression capabilities
*/
diff --git a/src/common/crypto.cpp b/src/common/crypto.cpp
index 8b19155..4c2eb99 100644
--- a/src/common/crypto.cpp
+++ b/src/common/crypto.cpp
@@ -46,7 +46,6 @@
/*
** \file crypto.cpp
-** \version $Id$
** \brief Provides support for pseuodrandom number generation.
*/
diff --git a/src/common/crypto.h b/src/common/crypto.h
index 462b7b8..bea1d80 100644
--- a/src/common/crypto.h
+++ b/src/common/crypto.h
@@ -46,7 +46,6 @@
/*
** \file crypto.h
-** \version $Id$
** \brief Provides support for pseuodrandom number generation.
*/
diff --git a/src/common/file.cpp b/src/common/file.cpp
index d85619f..cc8e1c2 100644
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -10,7 +10,6 @@
/*
** \file file.cpp
-** \version $Id$
** \brief Functions and definitions for common file I/O operations
*/
diff --git a/src/common/file.h b/src/common/file.h
index 6ed5652..3086701 100644
--- a/src/common/file.h
+++ b/src/common/file.h
@@ -10,7 +10,6 @@
/*
** \file file.h
-** \version $Id$
** \brief Functions and definitions for common file I/O operations
*/
diff --git a/src/common/html.cpp b/src/common/html.cpp
index 2a39d72..01a7c70 100644
--- a/src/common/html.cpp
+++ b/src/common/html.cpp
@@ -10,7 +10,6 @@
/*
** \file html.cpp
-** \version $Id$
** \brief HTML formatting functions
*/
diff --git a/src/common/html.h b/src/common/html.h
index 6693623..6242158 100644
--- a/src/common/html.h
+++ b/src/common/html.h
@@ -10,7 +10,6 @@
/*
** \file html.h
-** \version $Id$
** \brief HTML formatting functions
*/
diff --git a/src/common/net.cpp b/src/common/net.cpp
index fd5fd11..2b0690d 100644
--- a/src/common/net.cpp
+++ b/src/common/net.cpp
@@ -10,7 +10,6 @@
/*
** \file net.cpp
-** \version $Id$
** \brief Common network I/O and utility functions
*/
diff --git a/src/common/net.h b/src/common/net.h
index 7a89213..1cf122a 100644
--- a/src/common/net.h
+++ b/src/common/net.h
@@ -10,7 +10,6 @@
/*
** \file net.h
-** \version $Id$
** \brief Common network I/O and utility functions
*/
diff --git a/src/common/procutil.cpp b/src/common/procutil.cpp
index 68524cd..c2fbbc4 100644
--- a/src/common/procutil.cpp
+++ b/src/common/procutil.cpp
@@ -10,7 +10,6 @@
/*
** \file procutil.cpp
-** \version $Id$
** \brief Process information and pidfile functions
*/
diff --git a/src/common/procutil.h b/src/common/procutil.h
index 2b5a0ee..7e9b7dc 100644
--- a/src/common/procutil.h
+++ b/src/common/procutil.h
@@ -10,7 +10,6 @@
/*
** \file procutil.h
-** \version $Id$
** \brief Process information and pidfile functions
*/
diff --git a/src/common/stringutil.cpp b/src/common/stringutil.cpp
index b4058bd..91398f3 100644
--- a/src/common/stringutil.cpp
+++ b/src/common/stringutil.cpp
@@ -10,7 +10,6 @@
/*
** \file stringutil.cpp
-** \version $Id$
** \brief Common string manipulation functions
*/
diff --git a/src/common/stringutil.h b/src/common/stringutil.h
index 7f36030..7bf124d 100644
--- a/src/common/stringutil.h
+++ b/src/common/stringutil.h
@@ -10,7 +10,6 @@
/*
** \file stringutil.h
-** \version $Id$
** \brief Common string manipulation functions
*/
diff --git a/src/common/win32.cpp b/src/common/win32.cpp
index 15b5daa..e245c3c 100644
--- a/src/common/win32.cpp
+++ b/src/common/win32.cpp
@@ -10,7 +10,6 @@
/*
** \file win32.cpp
-** \version $Id$
** \brief Win32-specific functions
*/
diff --git a/src/common/win32.h b/src/common/win32.h
index 9469b68..b1ae9d5 100644
--- a/src/common/win32.h
+++ b/src/common/win32.h
@@ -10,7 +10,6 @@
/*
** \file win32.h
-** \version $Id$
** \brief Win32-specific functions
*/
diff --git a/src/crashreporter/CrashReportDialog.cpp b/src/crashreporter/CrashReportDialog.cpp
index 6433c66..f3acc68 100644
--- a/src/crashreporter/CrashReportDialog.cpp
+++ b/src/crashreporter/CrashReportDialog.cpp
@@ -10,7 +10,6 @@
/*
** \file CrashReportDialog.cpp
-** \version $Id$
** \brief Dialog that asks the user whether they would like to
** submit the crash report, along with optional additional details
** about what they were doing at the time of the crash.
diff --git a/src/crashreporter/CrashReportDialog.h b/src/crashreporter/CrashReportDialog.h
index 00e7bc0..bc05892 100644
--- a/src/crashreporter/CrashReportDialog.h
+++ b/src/crashreporter/CrashReportDialog.h
@@ -10,7 +10,6 @@
/*
** \file CrashReportDialog.h
-** \version $Id$
** \brief Dialog that asks the user whether they would like to
** submit the crash report, along with optional additional details
** about what they were doing at the time of the crash.
diff --git a/src/crashreporter/CrashReportUploader.cpp b/src/crashreporter/CrashReportUploader.cpp
index ef76ff3..cd59ee3 100644
--- a/src/crashreporter/CrashReportUploader.cpp
+++ b/src/crashreporter/CrashReportUploader.cpp
@@ -10,7 +10,6 @@
/*
** \file CrashReportUploader.cpp
-** \version $Id$
** \brief Uploads a minidump file and any extra information to a crash
** reporting server.
*/
diff --git a/src/crashreporter/CrashReportUploader.h b/src/crashreporter/CrashReportUploader.h
index 724ce0c..dd97954 100644
--- a/src/crashreporter/CrashReportUploader.h
+++ b/src/crashreporter/CrashReportUploader.h
@@ -10,7 +10,6 @@
/*
** \file CrashReportUploader.h
-** \version $Id$
** \brief Uploads a minidump file and any extra information to a crash
** reporting server.
*/
diff --git a/src/crashreporter/UploadProgressDialog.cpp b/src/crashreporter/UploadProgressDialog.cpp
index 21f0844..4030e10 100644
--- a/src/crashreporter/UploadProgressDialog.cpp
+++ b/src/crashreporter/UploadProgressDialog.cpp
@@ -10,7 +10,6 @@
/*
** \file UploadProgressDialog.cpp
-** \version $Id$
** \brief Displays the progress of uploading a crash report to the server
*/
diff --git a/src/crashreporter/UploadProgressDialog.h b/src/crashreporter/UploadProgressDialog.h
index f6d0218..e2cfcec 100644
--- a/src/crashreporter/UploadProgressDialog.h
+++ b/src/crashreporter/UploadProgressDialog.h
@@ -10,7 +10,6 @@
/*
** \file UploadProgressDialog.cpp
-** \version $Id$
** \brief Displays the progress of uploading a crash report to the server
*/
diff --git a/src/crashreporter/main.cpp b/src/crashreporter/main.cpp
index a6412d7..9d77dfd 100644
--- a/src/crashreporter/main.cpp
+++ b/src/crashreporter/main.cpp
@@ -10,7 +10,6 @@
/*
** \file main.cpp
-** \version $Id$
** \brief Application that is run after Vidalia crashes and asks the
** user if they would like to submit the crash report.
*/
diff --git a/src/torcontrol/AddressMap.cpp b/src/torcontrol/AddressMap.cpp
index f3ad3b8..802d3f3 100644
--- a/src/torcontrol/AddressMap.cpp
+++ b/src/torcontrol/AddressMap.cpp
@@ -10,7 +10,6 @@
/*
** \file AddressMap.cpp
-** \version $Id: bandwidthevent.h 1563 2006-12-26 06:06:04Z edmanm $
** \brief Stores a list of address mappings and their expiration times
*/
diff --git a/src/torcontrol/AddressMap.h b/src/torcontrol/AddressMap.h
index b590278..10a7b87 100644
--- a/src/torcontrol/AddressMap.h
+++ b/src/torcontrol/AddressMap.h
@@ -10,7 +10,6 @@
/*
** \file AddressMap.h
-** \version $Id: bandwidthevent.h 1563 2006-12-26 06:06:04Z edmanm $
** \brief Stores a list of address mappings and their expiration times
*/
diff --git a/src/torcontrol/BootstrapStatus.cpp b/src/torcontrol/BootstrapStatus.cpp
index e21a79a..32adaea 100644
--- a/src/torcontrol/BootstrapStatus.cpp
+++ b/src/torcontrol/BootstrapStatus.cpp
@@ -10,7 +10,6 @@
/*
** \file BootstrapStatus.cpp
-** \version $Id$
** \brief Describes the Tor software's current bootstrapping status
*/
diff --git a/src/torcontrol/BootstrapStatus.h b/src/torcontrol/BootstrapStatus.h
index 551f82d..4123def 100644
--- a/src/torcontrol/BootstrapStatus.h
+++ b/src/torcontrol/BootstrapStatus.h
@@ -10,7 +10,6 @@
/*
** \file BootstrapStatus.h
-** \version $Id$
** \brief Describes the Tor software's current bootstrap status
*/
diff --git a/src/torcontrol/Circuit.cpp b/src/torcontrol/Circuit.cpp
index e5b7704..4855290 100644
--- a/src/torcontrol/Circuit.cpp
+++ b/src/torcontrol/Circuit.cpp
@@ -10,7 +10,6 @@
/*
** \file Circuit.cpp
-** \version $Id$
** \brief Object representing a Tor circuit
*/
diff --git a/src/torcontrol/Circuit.h b/src/torcontrol/Circuit.h
index 7c381b9..cb6e41a 100644
--- a/src/torcontrol/Circuit.h
+++ b/src/torcontrol/Circuit.h
@@ -10,7 +10,6 @@
/*
** \file Circuit.h
-** \version $Id$
** \brief Object representing a Tor circuit
*/
diff --git a/src/torcontrol/ControlCommand.cpp b/src/torcontrol/ControlCommand.cpp
index 7dbd71e..6dd8ae0 100644
--- a/src/torcontrol/ControlCommand.cpp
+++ b/src/torcontrol/ControlCommand.cpp
@@ -10,7 +10,6 @@
/*
** \file ControlCommand.cpp
-** \version $Id$
** \brief A command sent to Tor's control interface
*/
diff --git a/src/torcontrol/ControlCommand.h b/src/torcontrol/ControlCommand.h
index a0f8fe4..b3bb974 100644
--- a/src/torcontrol/ControlCommand.h
+++ b/src/torcontrol/ControlCommand.h
@@ -10,7 +10,6 @@
/*
** \file ControlCommand.h
-** \version $Id$
** \brief A command sent to Tor's control interface
*/
diff --git a/src/torcontrol/ControlConnection.cpp b/src/torcontrol/ControlConnection.cpp
index d63e094..17d32b1 100644
--- a/src/torcontrol/ControlConnection.cpp
+++ b/src/torcontrol/ControlConnection.cpp
@@ -10,7 +10,6 @@
/*
** \file ControlConnection.cpp
-** \version $Id$
** \brief A connection to Tor's control interface, responsible for sending and
** receiving commands and events
*/
diff --git a/src/torcontrol/ControlConnection.h b/src/torcontrol/ControlConnection.h
index 45aaa4c..2fa9fc9 100644
--- a/src/torcontrol/ControlConnection.h
+++ b/src/torcontrol/ControlConnection.h
@@ -10,7 +10,6 @@
/*
** \file ControlConnection.h
-** \version $Id$
** \brief A connection to Tor's control interface, responsible for sending and
** receiving commands and events
**/
diff --git a/src/torcontrol/ControlMethod.cpp b/src/torcontrol/ControlMethod.cpp
index 507e282..c23dace 100644
--- a/src/torcontrol/ControlMethod.cpp
+++ b/src/torcontrol/ControlMethod.cpp
@@ -10,7 +10,6 @@
/*
** \file ControlMethod.cpp
-** \version $Id$
** \brief Class for specifying which method is used to communicate to Tor
*/
diff --git a/src/torcontrol/ControlMethod.h b/src/torcontrol/ControlMethod.h
index 76e08b7..8a593df 100644
--- a/src/torcontrol/ControlMethod.h
+++ b/src/torcontrol/ControlMethod.h
@@ -10,7 +10,6 @@
/*
** \file ControlMethod.h
-** \version $Id$
** \brief Class for specifying which method is used to communicate to Tor
*/
diff --git a/src/torcontrol/ControlReply.cpp b/src/torcontrol/ControlReply.cpp
index c3a08ee..296a8a5 100644
--- a/src/torcontrol/ControlReply.cpp
+++ b/src/torcontrol/ControlReply.cpp
@@ -10,7 +10,6 @@
/*
** \file ControlReply.cpp
-** \version $Id$
** \brief A response from Tor's control interface
*/
diff --git a/src/torcontrol/ControlReply.h b/src/torcontrol/ControlReply.h
index 8213e32..421b128 100644
--- a/src/torcontrol/ControlReply.h
+++ b/src/torcontrol/ControlReply.h
@@ -10,7 +10,6 @@
/*
** \file ControlReply.h
-** \version $Id$
** \brief A response from Tor's control interface
*/
diff --git a/src/torcontrol/ControlSocket.cpp b/src/torcontrol/ControlSocket.cpp
index d3d9fa8..8ba8e86 100644
--- a/src/torcontrol/ControlSocket.cpp
+++ b/src/torcontrol/ControlSocket.cpp
@@ -10,7 +10,6 @@
/*
** \file ControlSocket.cpp
-** \version $Id$
** \brief Socket used to connect to Tor's control interface
*/
diff --git a/src/torcontrol/ControlSocket.h b/src/torcontrol/ControlSocket.h
index 2f14f1a..3dcc36b 100644
--- a/src/torcontrol/ControlSocket.h
+++ b/src/torcontrol/ControlSocket.h
@@ -10,7 +10,6 @@
/*
** \file ControlSocket.h
-** \version $Id$
** \brief Socket used to connect to Tor's control interface
*/
diff --git a/src/torcontrol/LogEvent.cpp b/src/torcontrol/LogEvent.cpp
index 485fac8..f735f5c 100644
--- a/src/torcontrol/LogEvent.cpp
+++ b/src/torcontrol/LogEvent.cpp
@@ -10,7 +10,6 @@
/*
** \file LogEvent.cpp
-** \version $Id$
** \brief Event dispatched containing a log message from Tor
*/
diff --git a/src/torcontrol/LogEvent.h b/src/torcontrol/LogEvent.h
index 5adc33e..8a6c019 100644
--- a/src/torcontrol/LogEvent.h
+++ b/src/torcontrol/LogEvent.h
@@ -10,7 +10,6 @@
/*
** \file LogEvent.h
-** \version $Id$
** \brief Event dispatched containing a log message from Tor
*/
diff --git a/src/torcontrol/ProtocolInfo.cpp b/src/torcontrol/ProtocolInfo.cpp
index efd7f44..45ebe4a 100644
--- a/src/torcontrol/ProtocolInfo.cpp
+++ b/src/torcontrol/ProtocolInfo.cpp
@@ -10,7 +10,6 @@
/*
** \file ProtocolInfo.cpp
-** \version $Id$
** \brief Container for information in a PROTOCOLINFO reply from Tor
*/
diff --git a/src/torcontrol/ProtocolInfo.h b/src/torcontrol/ProtocolInfo.h
index 0b7a1b6..c523db4 100644
--- a/src/torcontrol/ProtocolInfo.h
+++ b/src/torcontrol/ProtocolInfo.h
@@ -10,7 +10,6 @@
/*
** \file ProtocolInfo.h
-** \version $Id$
** \brief Container for information in a PROTOCOLINFO reply from Tor
*/
diff --git a/src/torcontrol/ReplyLine.cpp b/src/torcontrol/ReplyLine.cpp
index 0184961..093ab39 100644
--- a/src/torcontrol/ReplyLine.cpp
+++ b/src/torcontrol/ReplyLine.cpp
@@ -10,7 +10,6 @@
/*
** \file ReplyLine.cpp
-** \version $Id$
** \brief Reply from a previous control command sent to Tor
*/
diff --git a/src/torcontrol/ReplyLine.h b/src/torcontrol/ReplyLine.h
index 8fb9b3c..4cc9438 100644
--- a/src/torcontrol/ReplyLine.h
+++ b/src/torcontrol/ReplyLine.h
@@ -10,7 +10,6 @@
/*
** \file ReplyLine.h
-** \version $Id$
** \brief Reply from a previous control command sent to Tor
*/
diff --git a/src/torcontrol/RouterDescriptor.cpp b/src/torcontrol/RouterDescriptor.cpp
index 171ae03..8bae277 100644
--- a/src/torcontrol/RouterDescriptor.cpp
+++ b/src/torcontrol/RouterDescriptor.cpp
@@ -10,7 +10,6 @@
/*
** \file RouterDescriptor.cpp
-** \version $Id$
** \brief Parses a blob of router descriptor text from Tor
*/
diff --git a/src/torcontrol/RouterDescriptor.h b/src/torcontrol/RouterDescriptor.h
index 7f578d9..6dbf33d 100644
--- a/src/torcontrol/RouterDescriptor.h
+++ b/src/torcontrol/RouterDescriptor.h
@@ -10,7 +10,6 @@
/*
** \file RouterDescriptor.h
-** \version $Id$
** \brief Parses a blob of router descriptor text from Tor
*/
diff --git a/src/torcontrol/RouterStatus.cpp b/src/torcontrol/RouterStatus.cpp
index 2de6030..b2644ee 100644
--- a/src/torcontrol/RouterStatus.cpp
+++ b/src/torcontrol/RouterStatus.cpp
@@ -10,7 +10,6 @@
/*
** \file RouterStatus.cpp
-** \version $Id$
** \brief Parses a blob of router status text from Tor
*/
diff --git a/src/torcontrol/RouterStatus.h b/src/torcontrol/RouterStatus.h
index a8eb3a9..4315978 100644
--- a/src/torcontrol/RouterStatus.h
+++ b/src/torcontrol/RouterStatus.h
@@ -10,7 +10,6 @@
/*
** \file RouterStatus.h
-** \version $Id$
** \brief Parses a blob of router status text from Tor
*/
diff --git a/src/torcontrol/SendCommandEvent.cpp b/src/torcontrol/SendCommandEvent.cpp
index da781db..2e88927 100644
--- a/src/torcontrol/SendCommandEvent.cpp
+++ b/src/torcontrol/SendCommandEvent.cpp
@@ -10,7 +10,6 @@
/*
** \file SendEommandEvent.cpp
-** \version $Id$
** \brief An event posted to a socket living in another thread, indicating
** that it should send the given control command.
*/
diff --git a/src/torcontrol/SendCommandEvent.h b/src/torcontrol/SendCommandEvent.h
index 3a2f8ab..356ab14 100644
--- a/src/torcontrol/SendCommandEvent.h
+++ b/src/torcontrol/SendCommandEvent.h
@@ -10,7 +10,6 @@
/*
** \file SendCommandEvent.h
-** \version $Id$
** \brief An event posted to a socket living in another thread, indicating
** that it should send the given control command.
*/
diff --git a/src/torcontrol/Stream.cpp b/src/torcontrol/Stream.cpp
index b658f21..258638e 100644
--- a/src/torcontrol/Stream.cpp
+++ b/src/torcontrol/Stream.cpp
@@ -10,7 +10,6 @@
/*
** \file Stream.cpp
-** \version $Id$
** \brief Object representing a Tor stream
*/
diff --git a/src/torcontrol/Stream.h b/src/torcontrol/Stream.h
index 50e3639..860a04b 100644
--- a/src/torcontrol/Stream.h
+++ b/src/torcontrol/Stream.h
@@ -10,7 +10,6 @@
/*
** \file Stream.h
-** \version $Id$
** \brief Object representing a Tor stream
*/
diff --git a/src/torcontrol/TorControl.cpp b/src/torcontrol/TorControl.cpp
index c72958a..ea09724 100644
--- a/src/torcontrol/TorControl.cpp
+++ b/src/torcontrol/TorControl.cpp
@@ -10,7 +10,6 @@
/*
** \file TorControl.cpp
-** \version $Id$
** \brief Object for interacting with the Tor process and control interface
*/
diff --git a/src/torcontrol/TorControl.h b/src/torcontrol/TorControl.h
index 5637e8f..61313ae 100644
--- a/src/torcontrol/TorControl.h
+++ b/src/torcontrol/TorControl.h
@@ -10,7 +10,6 @@
/*
** \file TorControl.h
-** \version $Id$
** \brief Object for interacting with the Tor process and control interface
*/
diff --git a/src/torcontrol/TorEvents.cpp b/src/torcontrol/TorEvents.cpp
index 0106674..41f85b7 100644
--- a/src/torcontrol/TorEvents.cpp
+++ b/src/torcontrol/TorEvents.cpp
@@ -10,7 +10,6 @@
/*
** \file TorEvents.cpp
-** \version $Id$
** \brief Parses and dispatches events from Tor
*/
diff --git a/src/torcontrol/TorEvents.h b/src/torcontrol/TorEvents.h
index dbbf4f5..2c5b7f1 100644
--- a/src/torcontrol/TorEvents.h
+++ b/src/torcontrol/TorEvents.h
@@ -10,7 +10,6 @@
/*
** \file TorEvents.h
-** \version $Id$
** \brief Parses and dispatches events from Tor
*/
diff --git a/src/torcontrol/TorProcess.cpp b/src/torcontrol/TorProcess.cpp
index 2a95aa2..00786bd 100644
--- a/src/torcontrol/TorProcess.cpp
+++ b/src/torcontrol/TorProcess.cpp
@@ -10,7 +10,6 @@
/*
** \file TorProcess.cpp
-** \version $Id$
** \brief Starts and stops a Tor process
*/
diff --git a/src/torcontrol/TorProcess.h b/src/torcontrol/TorProcess.h
index 0dd7164..884d039 100644
--- a/src/torcontrol/TorProcess.h
+++ b/src/torcontrol/TorProcess.h
@@ -10,7 +10,6 @@
/*
** \file TorProcess.h
-** \version $Id$
** \brief Starts and stops a Tor process
*/
diff --git a/src/torcontrol/TorService.cpp b/src/torcontrol/TorService.cpp
index 6d58526..bcf782f 100644
--- a/src/torcontrol/TorService.cpp
+++ b/src/torcontrol/TorService.cpp
@@ -10,7 +10,6 @@
/*
** \file TorService.cpp
-** \version $Id$
** \brief Starts, stops, installs, and uninstalls a Tor service (Win32).
*/
diff --git a/src/torcontrol/TorService.h b/src/torcontrol/TorService.h
index 92e590a..b7b4bc0 100644
--- a/src/torcontrol/TorService.h
+++ b/src/torcontrol/TorService.h
@@ -10,7 +10,6 @@
/*
** \file torservice.h
-** \version $Id$
** \brief Starts, stops, installs, and uninstalls a Tor service (Win32).
*/
diff --git a/src/torcontrol/TorSignal.cpp b/src/torcontrol/TorSignal.cpp
index dea79e4..a9bac4b 100644
--- a/src/torcontrol/TorSignal.cpp
+++ b/src/torcontrol/TorSignal.cpp
@@ -10,7 +10,6 @@
/*
** \file TorSignal.cpp
-** \version $Id$
** \brief Sends a signal to Tor's control interface
*/
diff --git a/src/torcontrol/TorSignal.h b/src/torcontrol/TorSignal.h
index eab57cc..cd8bf26 100644
--- a/src/torcontrol/TorSignal.h
+++ b/src/torcontrol/TorSignal.h
@@ -10,7 +10,6 @@
/*
** \file TorSignal.h
-** \version $Id$
** \brief Sends a signal to Tor's control interface
*/
diff --git a/src/torcontrol/tcglobal.cpp b/src/torcontrol/tcglobal.cpp
index 22624e6..6b2b54f 100644
--- a/src/torcontrol/tcglobal.cpp
+++ b/src/torcontrol/tcglobal.cpp
@@ -10,7 +10,6 @@
/*
** \file tcglobal.cpp
-** \version $Id$
** \brief Provides common methods and constants used by the torcontrol library
*/
diff --git a/src/torcontrol/tcglobal.h b/src/torcontrol/tcglobal.h
index f94a8ee..949647d 100644
--- a/src/torcontrol/tcglobal.h
+++ b/src/torcontrol/tcglobal.h
@@ -10,7 +10,6 @@
/*
** \file tcglobal.h
-** \version $Id$
** \brief Provides common methods and constants used by the torcontrol library
*/
diff --git a/src/vidalia/ControlPasswordInputDialog.cpp b/src/vidalia/ControlPasswordInputDialog.cpp
index dd27d12..5cc4dec 100644
--- a/src/vidalia/ControlPasswordInputDialog.cpp
+++ b/src/vidalia/ControlPasswordInputDialog.cpp
@@ -10,7 +10,6 @@
/*
** \file ControlPasswordInputDialog.cpp
-** \version $Id$
** \brief Prompts the user to enter their control port password, and gives
** them the option to save or attempt to reset it.
*/
diff --git a/src/vidalia/ControlPasswordInputDialog.h b/src/vidalia/ControlPasswordInputDialog.h
index 849b436..9722062 100644
--- a/src/vidalia/ControlPasswordInputDialog.h
+++ b/src/vidalia/ControlPasswordInputDialog.h
@@ -10,7 +10,6 @@
/*
** \file ControlPasswordInputDialog.h
-** \version $Id$
** \brief Prompts the user to enter their control port password, and gives
** them the option to save or attempt to reset it.
*/
diff --git a/src/vidalia/CrashReporter.cpp b/src/vidalia/CrashReporter.cpp
index 7bb7d8b..b3a06fe 100644
--- a/src/vidalia/CrashReporter.cpp
+++ b/src/vidalia/CrashReporter.cpp
@@ -39,7 +39,6 @@
/*
** \file CrashReporter.h
-** \version $Id$
** \brief General routines to install a Breakpad-based exception handler and
** set options related to launching the crash reporting application.
*/
diff --git a/src/vidalia/CrashReporter.h b/src/vidalia/CrashReporter.h
index c627f8a..3ad3ffb 100644
--- a/src/vidalia/CrashReporter.h
+++ b/src/vidalia/CrashReporter.h
@@ -10,7 +10,6 @@
/*
** \file CrashReporter.h
-** \version $Id$
** \brief General routines to install a Breakpad-based exception handler and
** set options related to launching the crash reporting application.
*/
diff --git a/src/vidalia/HelperProcess.cpp b/src/vidalia/HelperProcess.cpp
index 431f4cb..07fa733 100644
--- a/src/vidalia/HelperProcess.cpp
+++ b/src/vidalia/HelperProcess.cpp
@@ -34,7 +34,6 @@
/*
** \file helperprocess.cpp
-** \version $Id$
** \brief Invokes a web browser process (originally by Steven. J. Murdoch)
*/
diff --git a/src/vidalia/HelperProcess.h b/src/vidalia/HelperProcess.h
index e7a6221..795d077 100644
--- a/src/vidalia/HelperProcess.h
+++ b/src/vidalia/HelperProcess.h
@@ -34,7 +34,6 @@
/*
** \file HelperProcess.h
-** \version $Id$
** \brief Invokes a web browser process (originally by Steven. J. Murdoch)
*/
diff --git a/src/vidalia/LanguageSupport.cpp b/src/vidalia/LanguageSupport.cpp
index 8c70f1c..b9959ae 100644
--- a/src/vidalia/LanguageSupport.cpp
+++ b/src/vidalia/LanguageSupport.cpp
@@ -10,7 +10,6 @@
/*
** \file LanguageSupport.cpp
-** \version $Id$
** \brief Contains languages supported by Vidalia
*/
diff --git a/src/vidalia/LanguageSupport.h b/src/vidalia/LanguageSupport.h
index 6b3f7bd..4abc6dc 100644
--- a/src/vidalia/LanguageSupport.h
+++ b/src/vidalia/LanguageSupport.h
@@ -10,7 +10,6 @@
/*
** \file LanguageSupport.h
-** \version $Id$
** \brief Contains languages supported by Vidalia
*/
diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp
index da2e14c..1a3c215 100644
--- a/src/vidalia/MainWindow.cpp
+++ b/src/vidalia/MainWindow.cpp
@@ -10,7 +10,6 @@
/*
** \file MainWindow.cpp
-** \version $Id$
** \brief Main (hidden) window. Creates tray menu and child windows
**
** Implements the main window. The main window is a hidden window that serves
diff --git a/src/vidalia/MainWindow.h b/src/vidalia/MainWindow.h
index bb704be..1d913d0 100644
--- a/src/vidalia/MainWindow.h
+++ b/src/vidalia/MainWindow.h
@@ -10,7 +10,6 @@
/*
** \file MainWindow.h
-** \version $Id$
** \brief Main window. Creates tray menu and child windows
*/
diff --git a/src/vidalia/PackageInfo.cpp b/src/vidalia/PackageInfo.cpp
index ba551b3..59ef18f 100644
--- a/src/vidalia/PackageInfo.cpp
+++ b/src/vidalia/PackageInfo.cpp
@@ -10,7 +10,6 @@
/*
** \file PackageInfo.cpp
-** \version $Id$
** \brief Contains information about a single available updated software
** package.
*/
diff --git a/src/vidalia/PackageInfo.h b/src/vidalia/PackageInfo.h
index ca23678..e1dc692 100644
--- a/src/vidalia/PackageInfo.h
+++ b/src/vidalia/PackageInfo.h
@@ -10,7 +10,6 @@
/*
** \file PackageInfo.h
-** \version $Id$
** \brief Contains information about a single available updated software
** package.
*/
diff --git a/src/vidalia/UpdatesAvailableDialog.cpp b/src/vidalia/UpdatesAvailableDialog.cpp
index 0f5cc0f..65249ce 100644
--- a/src/vidalia/UpdatesAvailableDialog.cpp
+++ b/src/vidalia/UpdatesAvailableDialog.cpp
@@ -10,7 +10,6 @@
/*
** \file UpdatesAvailableDialog.cpp
-** \version $Id$
** \brief Displays a list of available updates and details, such as release
** notes. The user can choose to either install the updates now or later, or
** skip the updates entirely.
diff --git a/src/vidalia/UpdatesAvailableDialog.h b/src/vidalia/UpdatesAvailableDialog.h
index 05311b1..e90a3de 100644
--- a/src/vidalia/UpdatesAvailableDialog.h
+++ b/src/vidalia/UpdatesAvailableDialog.h
@@ -10,7 +10,6 @@
/*
** \file UpdatesAvailableDialog.h
-** \version $Id$
** \brief Displays a list of available updates and details, such as release
** notes. The user can choose to either install the updates now or later, or
** skip the updates entirely.
diff --git a/src/vidalia/VClickLabel.cpp b/src/vidalia/VClickLabel.cpp
index 41fe757..61e11fe 100644
--- a/src/vidalia/VClickLabel.cpp
+++ b/src/vidalia/VClickLabel.cpp
@@ -10,7 +10,6 @@
/*
** \file VClickLabel.cpp
-** \version $Id$
** \brief Custom widget to create a clickable label with both an image and text.
*/
diff --git a/src/vidalia/VClickLabel.h b/src/vidalia/VClickLabel.h
index 210aac3..ae4ec5a 100644
--- a/src/vidalia/VClickLabel.h
+++ b/src/vidalia/VClickLabel.h
@@ -10,7 +10,6 @@
/*
** \file VClickLabel.h
-** \version $Id$
** \brief Custom widget to create a clickable label with both an image and text.
*/
diff --git a/src/vidalia/VMessageBox.cpp b/src/vidalia/VMessageBox.cpp
index 149794a..99d8a74 100644
--- a/src/vidalia/VMessageBox.cpp
+++ b/src/vidalia/VMessageBox.cpp
@@ -10,7 +10,6 @@
/*
** \file VMessageBox.cpp
-** \version $Id$
** \brief Provides a custom Vidalia mesage box
*/
diff --git a/src/vidalia/VMessageBox.h b/src/vidalia/VMessageBox.h
index 7d11dca..a4b7f3b 100644
--- a/src/vidalia/VMessageBox.h
+++ b/src/vidalia/VMessageBox.h
@@ -10,7 +10,6 @@
/*
** \file VMessageBox.h
-** \version $Id$
** \brief Provides a custom Vidalia mesage box
*/
diff --git a/src/vidalia/Vidalia.cpp b/src/vidalia/Vidalia.cpp
index 01e9def..f88c94f 100644
--- a/src/vidalia/Vidalia.cpp
+++ b/src/vidalia/Vidalia.cpp
@@ -10,7 +10,6 @@
/*
** \file Vidalia.cpp
-** \version $Id$
** \brief Main Vidalia QApplication object
*/
diff --git a/src/vidalia/Vidalia.h b/src/vidalia/Vidalia.h
index b21288c..bc5d124 100644
--- a/src/vidalia/Vidalia.h
+++ b/src/vidalia/Vidalia.h
@@ -10,7 +10,6 @@
/*
** \file vidalia.h
-** \version $Id$
** \brief Main Vidalia QApplication object
*/
diff --git a/src/vidalia/VidaliaWindow.cpp b/src/vidalia/VidaliaWindow.cpp
index 614d71a..4bec2bd 100644
--- a/src/vidalia/VidaliaWindow.cpp
+++ b/src/vidalia/VidaliaWindow.cpp
@@ -10,7 +10,6 @@
/*
** \file VidaliaWindow.cpp
-** \version $Id$
** \brief Common superclass for all Vidalia windows
*/
diff --git a/src/vidalia/VidaliaWindow.h b/src/vidalia/VidaliaWindow.h
index 41fad2d..30b44da 100644
--- a/src/vidalia/VidaliaWindow.h
+++ b/src/vidalia/VidaliaWindow.h
@@ -10,7 +10,6 @@
/*
** \file VidaliaWindow.h
-** \version $Id$
** \brief Common superclass for all Vidalia windows
*/
diff --git a/src/vidalia/about/AboutDialog.cpp b/src/vidalia/about/AboutDialog.cpp
index f3ed69a..56723ef 100644
--- a/src/vidalia/about/AboutDialog.cpp
+++ b/src/vidalia/about/AboutDialog.cpp
@@ -10,7 +10,6 @@
/*
** \file AboutDialog.cpp
-** \version $Id$
** \brief Displays information about Vidalia, Tor, and Qt
*/
diff --git a/src/vidalia/about/AboutDialog.h b/src/vidalia/about/AboutDialog.h
index 37ed385..1d654e4 100644
--- a/src/vidalia/about/AboutDialog.h
+++ b/src/vidalia/about/AboutDialog.h
@@ -10,7 +10,6 @@
/*
** \file AboutDialog.h
-** \version $Id$
** \brief Displays information about Vidalia, Tor, and Qt
*/
diff --git a/src/vidalia/about/LicenseDialog.cpp b/src/vidalia/about/LicenseDialog.cpp
index 3200500..ce8b98d 100644
--- a/src/vidalia/about/LicenseDialog.cpp
+++ b/src/vidalia/about/LicenseDialog.cpp
@@ -10,7 +10,6 @@
/*
** \file LicenseDialog.cpp
-** \version $Id$
** \brief Displays HTML-formatted license information for Vidalia and related
** software.
*/
diff --git a/src/vidalia/about/LicenseDialog.h b/src/vidalia/about/LicenseDialog.h
index f45d684..d462c40 100644
--- a/src/vidalia/about/LicenseDialog.h
+++ b/src/vidalia/about/LicenseDialog.h
@@ -10,7 +10,6 @@
/*
** \file LicenseDialog.h
-** \version $Id$
** \brief Displays HTML-formatted license information for Vidalia and related
** software.
*/
diff --git a/src/vidalia/bwgraph/BandwidthGraph.cpp b/src/vidalia/bwgraph/BandwidthGraph.cpp
index 87d0f32..938f54e 100644
--- a/src/vidalia/bwgraph/BandwidthGraph.cpp
+++ b/src/vidalia/bwgraph/BandwidthGraph.cpp
@@ -10,7 +10,6 @@
/*
** \file BandwidthGraph.cpp
-** \version $Id$
** \brief Displays a graph of Tor's bandwidth usage
*/
diff --git a/src/vidalia/bwgraph/BandwidthGraph.h b/src/vidalia/bwgraph/BandwidthGraph.h
index 2f7446d..4de9d22 100644
--- a/src/vidalia/bwgraph/BandwidthGraph.h
+++ b/src/vidalia/bwgraph/BandwidthGraph.h
@@ -10,7 +10,6 @@
/*
** \file BandwidthGraph.h
-** \version $Id$
** \brief Displays a graph of Tor's bandwidth usage
*/
diff --git a/src/vidalia/bwgraph/GraphFrame.cpp b/src/vidalia/bwgraph/GraphFrame.cpp
index f00f472..1f182c1 100644
--- a/src/vidalia/bwgraph/GraphFrame.cpp
+++ b/src/vidalia/bwgraph/GraphFrame.cpp
@@ -10,7 +10,6 @@
/*
** \file GraphFrame.cpp
-** \version $Id$
** \brief Graphs a series of send and receive data points
*/
diff --git a/src/vidalia/bwgraph/GraphFrame.h b/src/vidalia/bwgraph/GraphFrame.h
index 16534e8..17367ba 100644
--- a/src/vidalia/bwgraph/GraphFrame.h
+++ b/src/vidalia/bwgraph/GraphFrame.h
@@ -10,7 +10,6 @@
/*
** \file GraphFrame.h
-** \version $Id$
** \brief Graphs a series of send and receive data points
*/
diff --git a/src/vidalia/config/AbstractTorSettings.cpp b/src/vidalia/config/AbstractTorSettings.cpp
index e68a347..462eef7 100644
--- a/src/vidalia/config/AbstractTorSettings.cpp
+++ b/src/vidalia/config/AbstractTorSettings.cpp
@@ -10,7 +10,6 @@
/*
** \file AbstractTorSettings.cpp
-** \version $Id$
** \brief Manages settings that need to be SETCONF'ed to Tor
*/
diff --git a/src/vidalia/config/AbstractTorSettings.h b/src/vidalia/config/AbstractTorSettings.h
index 05eb731..15770ef 100644
--- a/src/vidalia/config/AbstractTorSettings.h
+++ b/src/vidalia/config/AbstractTorSettings.h
@@ -10,7 +10,6 @@
/*
** \file AbstractTorSettings.h
-** \version $Id$
** \brief Manages settings that need to be SETCONF'ed to Tor
*/
diff --git a/src/vidalia/config/AdvancedPage.cpp b/src/vidalia/config/AdvancedPage.cpp
index f5aa850..94c0308 100644
--- a/src/vidalia/config/AdvancedPage.cpp
+++ b/src/vidalia/config/AdvancedPage.cpp
@@ -10,7 +10,6 @@
/*
** \file AdvancedPage.cpp
-** \version $Id$
** \brief Advanced Tor and Vidalia configuration options
*/
diff --git a/src/vidalia/config/AdvancedPage.h b/src/vidalia/config/AdvancedPage.h
index 88a8865..de64cbe 100644
--- a/src/vidalia/config/AdvancedPage.h
+++ b/src/vidalia/config/AdvancedPage.h
@@ -10,7 +10,6 @@
/*
** \file AdvancedPage.h
-** \version $Id$
** \brief Advanced Tor and Vidalia configuration options
*/
diff --git a/src/vidalia/config/AppearancePage.cpp b/src/vidalia/config/AppearancePage.cpp
index 5114755..b4a3099 100644
--- a/src/vidalia/config/AppearancePage.cpp
+++ b/src/vidalia/config/AppearancePage.cpp
@@ -10,7 +10,6 @@
/*
** \file AppearancePage.cpp
-** \version $Id$
** \brief Displays Vidalia language and style settings
*/
diff --git a/src/vidalia/config/AppearancePage.h b/src/vidalia/config/AppearancePage.h
index 1f2866f..b7262a3 100644
--- a/src/vidalia/config/AppearancePage.h
+++ b/src/vidalia/config/AppearancePage.h
@@ -10,7 +10,6 @@
/*
** \file AppearancePage.h
-** \version $Id$
** \brief Displays Vidalia language and style settings
*/
diff --git a/src/vidalia/config/BridgeDownloader.cpp b/src/vidalia/config/BridgeDownloader.cpp
index cf6a0e3..d70034d 100644
--- a/src/vidalia/config/BridgeDownloader.cpp
+++ b/src/vidalia/config/BridgeDownloader.cpp
@@ -10,7 +10,6 @@
/*
** \file BridgeDownloader.cpp
-** \version $Id$
** \brief Downloads a list of new bridge addresses via HTTPS
*/
diff --git a/src/vidalia/config/BridgeDownloader.h b/src/vidalia/config/BridgeDownloader.h
index d593a98..0cb87f4 100644
--- a/src/vidalia/config/BridgeDownloader.h
+++ b/src/vidalia/config/BridgeDownloader.h
@@ -10,7 +10,6 @@
/*
** \file BridgeDownloader.h
-** \version $Id$
** \brief Downloads a list of new bridge addresses via HTTPS
*/
diff --git a/src/vidalia/config/BridgeDownloaderProgressDialog.cpp b/src/vidalia/config/BridgeDownloaderProgressDialog.cpp
index 260000e..b4d8e28 100644
--- a/src/vidalia/config/BridgeDownloaderProgressDialog.cpp
+++ b/src/vidalia/config/BridgeDownloaderProgressDialog.cpp
@@ -10,7 +10,6 @@
/*
** \file BridgeDownloaderProgressDialog.cpp
-** \version $Id$
** \brief Displays the progress of a request for bridge addresses
*/
diff --git a/src/vidalia/config/BridgeDownloaderProgressDialog.h b/src/vidalia/config/BridgeDownloaderProgressDialog.h
index a6257a5..86fb0d3 100644
--- a/src/vidalia/config/BridgeDownloaderProgressDialog.h
+++ b/src/vidalia/config/BridgeDownloaderProgressDialog.h
@@ -10,7 +10,6 @@
/*
** \file BridgeDownloaderProgressDialog.h
-** \version $Id$
** \brief Displays the progress of a request for bridge addresses
*/
diff --git a/src/vidalia/config/BridgeUsageDialog.cpp b/src/vidalia/config/BridgeUsageDialog.cpp
index 76384d4..a120fe1 100644
--- a/src/vidalia/config/BridgeUsageDialog.cpp
+++ b/src/vidalia/config/BridgeUsageDialog.cpp
@@ -10,7 +10,6 @@
/*
** \file BridgeUsageDialog.cpp
-** \version $Id$
** \brief Displays a summary of bridge usage information, including client
** geographic location history.
*/
diff --git a/src/vidalia/config/BridgeUsageDialog.h b/src/vidalia/config/BridgeUsageDialog.h
index a5c4611..5177254 100644
--- a/src/vidalia/config/BridgeUsageDialog.h
+++ b/src/vidalia/config/BridgeUsageDialog.h
@@ -10,7 +10,6 @@
/*
** \file BridgeUsageDialog.h
-** \version $Id$
** \brief Displays a summary of bridge usage information, including client
** geographic location history.
*/
diff --git a/src/vidalia/config/ConfigDialog.cpp b/src/vidalia/config/ConfigDialog.cpp
index 8e7a59b..d147ab8 100644
--- a/src/vidalia/config/ConfigDialog.cpp
+++ b/src/vidalia/config/ConfigDialog.cpp
@@ -10,7 +10,6 @@
/*
** \file ConfigDialog.cpp
-** \version $Id$
** \brief Contains a series of Vidalia and Tor configuration pages
*/
diff --git a/src/vidalia/config/ConfigDialog.h b/src/vidalia/config/ConfigDialog.h
index 42a2d79..1362038 100644
--- a/src/vidalia/config/ConfigDialog.h
+++ b/src/vidalia/config/ConfigDialog.h
@@ -10,7 +10,6 @@
/*
** \file ConfigDialog.h
-** \version $Id$
** \brief Contains a series of Vidalia and Tor configuration pages
*/
diff --git a/src/vidalia/config/ConfigPage.h b/src/vidalia/config/ConfigPage.h
index 03d235a..1e8eea8 100644
--- a/src/vidalia/config/ConfigPage.h
+++ b/src/vidalia/config/ConfigPage.h
@@ -10,7 +10,6 @@
/*
** \file ConfigPage.h
-** \version $Id$
** \brief Pure-virtual class for a configuration page
*/
diff --git a/src/vidalia/config/ConfigPageStack.cpp b/src/vidalia/config/ConfigPageStack.cpp
index 07291a1..c8302c5 100644
--- a/src/vidalia/config/ConfigPageStack.cpp
+++ b/src/vidalia/config/ConfigPageStack.cpp
@@ -10,7 +10,6 @@
/*
** \file ConfigPageStack.cpp
-** \version $Id$
** \brief A collection of configuration pages
*/
diff --git a/src/vidalia/config/ConfigPageStack.h b/src/vidalia/config/ConfigPageStack.h
index 00ce1a5..00af77b 100644
--- a/src/vidalia/config/ConfigPageStack.h
+++ b/src/vidalia/config/ConfigPageStack.h
@@ -10,7 +10,6 @@
/*
** \file ConfigPageStack.h
-** \version $Id$
** \brief A collection of configuration pages
*/
diff --git a/src/vidalia/config/DomainValidator.cpp b/src/vidalia/config/DomainValidator.cpp
index 6886bcd..2ee67cb 100644
--- a/src/vidalia/config/DomainValidator.cpp
+++ b/src/vidalia/config/DomainValidator.cpp
@@ -10,7 +10,6 @@
/*
** \file DomainValidator.cpp
-** \version $Id$
** \brief Validates that a given domain name is (probably) valid
*/
diff --git a/src/vidalia/config/DomainValidator.h b/src/vidalia/config/DomainValidator.h
index 20aabda..996f7f4 100644
--- a/src/vidalia/config/DomainValidator.h
+++ b/src/vidalia/config/DomainValidator.h
@@ -10,7 +10,6 @@
/*
** \file DomainValidator.h
-** \version $Id$
** \brief Validates that a given domain name is (probably) valid
*/
diff --git a/src/vidalia/config/ExitPolicy.cpp b/src/vidalia/config/ExitPolicy.cpp
index e48ff72..831b4d8 100644
--- a/src/vidalia/config/ExitPolicy.cpp
+++ b/src/vidalia/config/ExitPolicy.cpp
@@ -10,7 +10,6 @@
/*
** \file ExitPolicy.cpp
-** \version $Id$
** \brief Collection of Policy objects representing an exit policy
*/
diff --git a/src/vidalia/config/ExitPolicy.h b/src/vidalia/config/ExitPolicy.h
index b46bcb0..80f8e88 100644
--- a/src/vidalia/config/ExitPolicy.h
+++ b/src/vidalia/config/ExitPolicy.h
@@ -10,7 +10,6 @@
/*
** \file ExitPolicy.h
-** \version $Id$
** \brief Collection of Policy objects representing an exit policy
*/
diff --git a/src/vidalia/config/GeneralPage.cpp b/src/vidalia/config/GeneralPage.cpp
index 888ecde..eef0d90 100644
--- a/src/vidalia/config/GeneralPage.cpp
+++ b/src/vidalia/config/GeneralPage.cpp
@@ -10,7 +10,6 @@
/*
** \file GeneralPage.cpp
-** \version $Id$
** \brief General Tor and Vidalia configuration options
*/
diff --git a/src/vidalia/config/GeneralPage.h b/src/vidalia/config/GeneralPage.h
index 5fb5695..ac43f71 100644
--- a/src/vidalia/config/GeneralPage.h
+++ b/src/vidalia/config/GeneralPage.h
@@ -10,7 +10,6 @@
/*
** \file GeneralPage.h
-** \version $Id$
** \brief General Tor and Vidalia configuration options
*/
diff --git a/src/vidalia/config/IpValidator.cpp b/src/vidalia/config/IpValidator.cpp
index 142100d..87594f9 100644
--- a/src/vidalia/config/IpValidator.cpp
+++ b/src/vidalia/config/IpValidator.cpp
@@ -10,7 +10,6 @@
/*
** \file IpValidator.cpp
-** \version $Id$
** \brief Validates an entered IP address
*/
diff --git a/src/vidalia/config/IpValidator.h b/src/vidalia/config/IpValidator.h
index 7d88895..d757eb9 100644
--- a/src/vidalia/config/IpValidator.h
+++ b/src/vidalia/config/IpValidator.h
@@ -10,7 +10,6 @@
/*
** \file IpValidator.h
-** \version $Id$
** \brief Validates an entered IP address
*/
diff --git a/src/vidalia/config/Local8BitStringValidator.cpp b/src/vidalia/config/Local8BitStringValidator.cpp
index 8f7da82..7d1e0dc 100644
--- a/src/vidalia/config/Local8BitStringValidator.cpp
+++ b/src/vidalia/config/Local8BitStringValidator.cpp
@@ -10,7 +10,6 @@
/*
** \file Local8BitStringValidator.cpp
-** \version $Id$
** \brief Validates that a given string contains only characters capable of
** being represented in the current local 8-bit character encoding.
*/
diff --git a/src/vidalia/config/Local8BitStringValidator.h b/src/vidalia/config/Local8BitStringValidator.h
index 3e9a77d..ee796aa 100644
--- a/src/vidalia/config/Local8BitStringValidator.h
+++ b/src/vidalia/config/Local8BitStringValidator.h
@@ -10,7 +10,6 @@
/*
** \file Local8BitStringValidator.h
-** \version $Id$
** \brief Validates that a given string contains only characters capable of
** being represented in the current local 8-bit character encoding.
*/
diff --git a/src/vidalia/config/NetworkPage.cpp b/src/vidalia/config/NetworkPage.cpp
index 6805e22..f5bbc72 100644
--- a/src/vidalia/config/NetworkPage.cpp
+++ b/src/vidalia/config/NetworkPage.cpp
@@ -10,7 +10,6 @@
/*
** \file NetworkPage.cpp
-** \version $Id$
** \brief Network and firewall configuration options
*/
diff --git a/src/vidalia/config/NetworkPage.h b/src/vidalia/config/NetworkPage.h
index 1d6a166..04b06ab 100644
--- a/src/vidalia/config/NetworkPage.h
+++ b/src/vidalia/config/NetworkPage.h
@@ -10,7 +10,6 @@
/*
** \file NetworkPage.h
-** \version $Id$
** \brief Network and firewall configuration options
*/
diff --git a/src/vidalia/config/NetworkSettings.cpp b/src/vidalia/config/NetworkSettings.cpp
index d13c7a5..ff2e7d3 100644
--- a/src/vidalia/config/NetworkSettings.cpp
+++ b/src/vidalia/config/NetworkSettings.cpp
@@ -10,7 +10,6 @@
/*
** \file NetworkSettings.cpp
-** \version $Id$
** \brief Settings for configuring an HTTP/HTTPS proxy or bridges
*/
diff --git a/src/vidalia/config/NetworkSettings.h b/src/vidalia/config/NetworkSettings.h
index a6a6266..e610224 100644
--- a/src/vidalia/config/NetworkSettings.h
+++ b/src/vidalia/config/NetworkSettings.h
@@ -10,7 +10,6 @@
/*
** \file NetworkSettings.h
-** \version $Id$
** \brief Settings for configuring an HTTP/HTTPS proxy or bridges
*/
diff --git a/src/vidalia/config/NicknameValidator.cpp b/src/vidalia/config/NicknameValidator.cpp
index e65e88b..e960481 100644
--- a/src/vidalia/config/NicknameValidator.cpp
+++ b/src/vidalia/config/NicknameValidator.cpp
@@ -10,7 +10,6 @@
/*
** \file NicknameValidator.cpp
-** \version $Id$
** \brief Validates that a server nickname contains only valid characters
*/
diff --git a/src/vidalia/config/NicknameValidator.h b/src/vidalia/config/NicknameValidator.h
index f7317f3..c8192e5 100644
--- a/src/vidalia/config/NicknameValidator.h
+++ b/src/vidalia/config/NicknameValidator.h
@@ -10,7 +10,6 @@
/*
** \file NicknameValidator.h
-** \version $Id$
** \brief Validates that a server nickname contains only valid characters
*/
diff --git a/src/vidalia/config/Policy.cpp b/src/vidalia/config/Policy.cpp
index 27e5055..0c73e04 100644
--- a/src/vidalia/config/Policy.cpp
+++ b/src/vidalia/config/Policy.cpp
@@ -10,7 +10,6 @@
/*
** \file Policy.cpp
-** \version $Id$
** \brief Exit policy parsing
*/
diff --git a/src/vidalia/config/Policy.h b/src/vidalia/config/Policy.h
index c47f9be..28f5871 100644
--- a/src/vidalia/config/Policy.h
+++ b/src/vidalia/config/Policy.h
@@ -10,7 +10,6 @@
/*
** \file Policy.h
-** \version $Id$
** \brief Exit policy parsing
*/
diff --git a/src/vidalia/config/PortValidator.cpp b/src/vidalia/config/PortValidator.cpp
index 868a4d8..c328963 100644
--- a/src/vidalia/config/PortValidator.cpp
+++ b/src/vidalia/config/PortValidator.cpp
@@ -10,7 +10,6 @@
/*
** \file PortValidator.cpp
-** \version $Id$
** \brief Validates that a number is a valid port number
*/
diff --git a/src/vidalia/config/PortValidator.h b/src/vidalia/config/PortValidator.h
index 55297f7..062ed7b 100644
--- a/src/vidalia/config/PortValidator.h
+++ b/src/vidalia/config/PortValidator.h
@@ -10,7 +10,6 @@
/*
** \file PortValidator.h
-** \version $Id$
** \brief Validates that a number is a valid port number
*/
diff --git a/src/vidalia/config/ServerPage.cpp b/src/vidalia/config/ServerPage.cpp
index 69b6709..d42fb70 100644
--- a/src/vidalia/config/ServerPage.cpp
+++ b/src/vidalia/config/ServerPage.cpp
@@ -10,7 +10,6 @@
/*
** \file ServerPage.cpp
-** \version $Id$
** \brief Tor server configuration options
*/
diff --git a/src/vidalia/config/ServerPage.h b/src/vidalia/config/ServerPage.h
index fa52f25..d40e605 100644
--- a/src/vidalia/config/ServerPage.h
+++ b/src/vidalia/config/ServerPage.h
@@ -10,7 +10,6 @@
/*
** \file ServerPage.h
-** \version $Id$
** \brief Tor server configuration options
*/
diff --git a/src/vidalia/config/ServerSettings.cpp b/src/vidalia/config/ServerSettings.cpp
index 9ddbbca..22de6d6 100644
--- a/src/vidalia/config/ServerSettings.cpp
+++ b/src/vidalia/config/ServerSettings.cpp
@@ -10,7 +10,6 @@
/*
** \file ServerSettings.cpp
-** \version $Id$
** \brief Settings for running a Tor server
*/
diff --git a/src/vidalia/config/ServerSettings.h b/src/vidalia/config/ServerSettings.h
index 09889ab..79a5db9 100644
--- a/src/vidalia/config/ServerSettings.h
+++ b/src/vidalia/config/ServerSettings.h
@@ -10,7 +10,6 @@
/*
** \file ServerSettings.h
-** \version $Id$
** \brief Settings for running a Tor server
*/
diff --git a/src/vidalia/config/TorSettings.cpp b/src/vidalia/config/TorSettings.cpp
index fd9d3ad..046ff72 100644
--- a/src/vidalia/config/TorSettings.cpp
+++ b/src/vidalia/config/TorSettings.cpp
@@ -10,7 +10,6 @@
/*
** \file TorSettings.cpp
-** \version $Id$
** \brief Settings used for starting and running Tor
*/
diff --git a/src/vidalia/config/TorSettings.h b/src/vidalia/config/TorSettings.h
index 77ccf04..a116c61 100644
--- a/src/vidalia/config/TorSettings.h
+++ b/src/vidalia/config/TorSettings.h
@@ -10,7 +10,6 @@
/*
** \file TorSettings.h
-** \version $Id$
** \brief Settings used for starting and running Tor
*/
diff --git a/src/vidalia/config/TorrcDialog.cpp b/src/vidalia/config/TorrcDialog.cpp
index ddd5893..81d1a4a 100644
--- a/src/vidalia/config/TorrcDialog.cpp
+++ b/src/vidalia/config/TorrcDialog.cpp
@@ -10,7 +10,6 @@
/*
** \file TorrcDialog.cpp
-** \version $Id$
** \brief Torrc Dialog, contains the dialog for displaying and editing the torrc
**
** Implements the dialog for editing the torrc file inside Vidalia
diff --git a/src/vidalia/config/TorrcDialog.h b/src/vidalia/config/TorrcDialog.h
index 9451e9c..b5eadcc 100644
--- a/src/vidalia/config/TorrcDialog.h
+++ b/src/vidalia/config/TorrcDialog.h
@@ -10,7 +10,6 @@
/*
** \file TorrcDialog.h
-** \version $Id$
** \brief Torrc Dialog, contains the dialog for displaying and editing the torrc
*/
diff --git a/src/vidalia/config/UPNPControl.cpp b/src/vidalia/config/UPNPControl.cpp
index 54519b0..a87f785 100644
--- a/src/vidalia/config/UPNPControl.cpp
+++ b/src/vidalia/config/UPNPControl.cpp
@@ -10,7 +10,6 @@
/*
** \file UPNPControl.cpp
-** \version $Id$
** \brief Singleton object for interacting with UPNP device
*/
diff --git a/src/vidalia/config/UPNPControl.h b/src/vidalia/config/UPNPControl.h
index 11d7ab2..2e7006a 100644
--- a/src/vidalia/config/UPNPControl.h
+++ b/src/vidalia/config/UPNPControl.h
@@ -10,7 +10,6 @@
/*
** \file UPNPControl.h
-** \version $Id$
** \brief Singleton object for interacting with UPNP device
*/
diff --git a/src/vidalia/config/UPNPControlThread.cpp b/src/vidalia/config/UPNPControlThread.cpp
index 770cafe..d92ff46 100644
--- a/src/vidalia/config/UPNPControlThread.cpp
+++ b/src/vidalia/config/UPNPControlThread.cpp
@@ -10,7 +10,6 @@
/*
** \file UPNPControlThread.cpp
-** \version $Id$
** \brief Thread for configuring UPnP in the background
*/
diff --git a/src/vidalia/config/UPNPControlThread.h b/src/vidalia/config/UPNPControlThread.h
index 02be6cf..4a183f1 100644
--- a/src/vidalia/config/UPNPControlThread.h
+++ b/src/vidalia/config/UPNPControlThread.h
@@ -10,7 +10,6 @@
/*
** \file UPNPControlThread.h
-** \version $Id$
** \brief Thread for configuring UPnP in the background
*/
diff --git a/src/vidalia/config/UPNPTestDialog.cpp b/src/vidalia/config/UPNPTestDialog.cpp
index 4945ae8..7c28cd8 100644
--- a/src/vidalia/config/UPNPTestDialog.cpp
+++ b/src/vidalia/config/UPNPTestDialog.cpp
@@ -10,7 +10,6 @@
/*
** \file UPNPTestDialog.cpp
-** \version $Id$
** \brief Dialog that displays the progress of a UPnP configuration test
*/
diff --git a/src/vidalia/config/UPNPTestDialog.h b/src/vidalia/config/UPNPTestDialog.h
index d7f6537..1c26212 100644
--- a/src/vidalia/config/UPNPTestDialog.h
+++ b/src/vidalia/config/UPNPTestDialog.h
@@ -10,7 +10,6 @@
/*
** \file UPNPTestDialog.h
-** \version $Id$
** \brief Dialog that displays the progress of a UPnP configuration test
*/
diff --git a/src/vidalia/config/VSettings.cpp b/src/vidalia/config/VSettings.cpp
index 21c1e53..168392c 100644
--- a/src/vidalia/config/VSettings.cpp
+++ b/src/vidalia/config/VSettings.cpp
@@ -10,7 +10,6 @@
/*
** \file VSettings.cpp
-** \version $Id$
** \brief Stores and retrieves settings from Vidalia's configuration file.
*/
diff --git a/src/vidalia/config/VSettings.h b/src/vidalia/config/VSettings.h
index df93aea..d921b97 100644
--- a/src/vidalia/config/VSettings.h
+++ b/src/vidalia/config/VSettings.h
@@ -10,7 +10,6 @@
/*
** \file vsettings.h
-** \version $Id$
** \brief Stores and retrieves settings from Vidalia's configuration file.
*/
diff --git a/src/vidalia/config/VidaliaSettings.cpp b/src/vidalia/config/VidaliaSettings.cpp
index 193692d..f16e456 100644
--- a/src/vidalia/config/VidaliaSettings.cpp
+++ b/src/vidalia/config/VidaliaSettings.cpp
@@ -10,7 +10,6 @@
/*
** \file VidaliaSettings.cpp
-** \version $Id$
** \brief General Vidalia settings, such as language and interface style
*/
diff --git a/src/vidalia/config/VidaliaSettings.h b/src/vidalia/config/VidaliaSettings.h
index e3581ac..dbcc860 100644
--- a/src/vidalia/config/VidaliaSettings.h
+++ b/src/vidalia/config/VidaliaSettings.h
@@ -10,7 +10,6 @@
/*
** \file VidaliaSettings.h
-** \version $Id$
** \brief General Vidalia settings, such as language and interface style
*/
diff --git a/src/vidalia/help/browser/HelpBrowser.cpp b/src/vidalia/help/browser/HelpBrowser.cpp
index d1e5ab1..94d77c3 100644
--- a/src/vidalia/help/browser/HelpBrowser.cpp
+++ b/src/vidalia/help/browser/HelpBrowser.cpp
@@ -10,7 +10,6 @@
/*
** \file HelpBrowser.cpp
-** \version $Id$
** \brief Displays a list of help topics and content
*/
diff --git a/src/vidalia/help/browser/HelpBrowser.h b/src/vidalia/help/browser/HelpBrowser.h
index 820e927..2170822 100644
--- a/src/vidalia/help/browser/HelpBrowser.h
+++ b/src/vidalia/help/browser/HelpBrowser.h
@@ -10,7 +10,6 @@
/*
** \file HelpBrowser.h
-** \version $Id$
** \brief Displays a list of help topics and content
*/
diff --git a/src/vidalia/help/browser/HelpTextBrowser.cpp b/src/vidalia/help/browser/HelpTextBrowser.cpp
index 88d93b7..cb525ab 100644
--- a/src/vidalia/help/browser/HelpTextBrowser.cpp
+++ b/src/vidalia/help/browser/HelpTextBrowser.cpp
@@ -10,7 +10,6 @@
/*
** \file HelpTextBrowser.cpp
-** \version $Id$
** \brief Displays an HTML-based help document
*/
diff --git a/src/vidalia/help/browser/HelpTextBrowser.h b/src/vidalia/help/browser/HelpTextBrowser.h
index c6222e9..5ca8700 100644
--- a/src/vidalia/help/browser/HelpTextBrowser.h
+++ b/src/vidalia/help/browser/HelpTextBrowser.h
@@ -10,7 +10,6 @@
/*
** \file HelpTextBrowser.h
-** \version $Id$
** \brief Displays an HTML-based help document
*/
diff --git a/src/vidalia/log/LogFile.cpp b/src/vidalia/log/LogFile.cpp
index dc11d56..310294f 100644
--- a/src/vidalia/log/LogFile.cpp
+++ b/src/vidalia/log/LogFile.cpp
@@ -10,7 +10,6 @@
/*
** \file LogFile.cpp
-** \version $Id$
** \brief Logs messages from Tor to a file
*/
diff --git a/src/vidalia/log/LogFile.h b/src/vidalia/log/LogFile.h
index e21077c..d01f9d7 100644
--- a/src/vidalia/log/LogFile.h
+++ b/src/vidalia/log/LogFile.h
@@ -10,7 +10,6 @@
/*
** \file LogFile.h
-** \version $Id$
** \brief Logs messages from Tor to a file
*/
diff --git a/src/vidalia/log/LogHeaderView.cpp b/src/vidalia/log/LogHeaderView.cpp
index 6b85342..c62b7a1 100644
--- a/src/vidalia/log/LogHeaderView.cpp
+++ b/src/vidalia/log/LogHeaderView.cpp
@@ -10,7 +10,6 @@
/*
** \file LogHeaderView.cpp
-** \version $Id$
** \brief Header for the message log QTreeView
*/
diff --git a/src/vidalia/log/LogHeaderView.h b/src/vidalia/log/LogHeaderView.h
index bb8aa8d..6223d73 100644
--- a/src/vidalia/log/LogHeaderView.h
+++ b/src/vidalia/log/LogHeaderView.h
@@ -10,7 +10,6 @@
/*
** \file LogHeaderView.h
-** \version $Id$
** \brief Header for the message log QTreeView
*/
diff --git a/src/vidalia/log/LogMessageColumnDelegate.cpp b/src/vidalia/log/LogMessageColumnDelegate.cpp
index 0eb746a..8821438 100644
--- a/src/vidalia/log/LogMessageColumnDelegate.cpp
+++ b/src/vidalia/log/LogMessageColumnDelegate.cpp
@@ -10,7 +10,6 @@
/*
** \file LogMessageColumnDelegate.cpp
-** \version $Id$
** \brief Delegate responsible for rendering the log message column
*/
diff --git a/src/vidalia/log/LogMessageColumnDelegate.h b/src/vidalia/log/LogMessageColumnDelegate.h
index 864eedc..dbf9ca6 100644
--- a/src/vidalia/log/LogMessageColumnDelegate.h
+++ b/src/vidalia/log/LogMessageColumnDelegate.h
@@ -10,7 +10,6 @@
/*
** \file LogMessageColumnDelegate.h
-** \version $Id$
** \brief Delegate responsible for rendering the log message column
*/
diff --git a/src/vidalia/log/LogTreeItem.cpp b/src/vidalia/log/LogTreeItem.cpp
index 287de44..e7b6598 100644
--- a/src/vidalia/log/LogTreeItem.cpp
+++ b/src/vidalia/log/LogTreeItem.cpp
@@ -10,7 +10,6 @@
/*
** \file LogTreeItem.cpp
-** \version $Id$
** \brief Item representing a single message in the message log
*/
diff --git a/src/vidalia/log/LogTreeItem.h b/src/vidalia/log/LogTreeItem.h
index 5e200dc..a402011 100644
--- a/src/vidalia/log/LogTreeItem.h
+++ b/src/vidalia/log/LogTreeItem.h
@@ -10,7 +10,6 @@
/*
** \file LogTreeItem.h
-** \version $Id$
** \brief Item representing a single message in the message log
*/
diff --git a/src/vidalia/log/LogTreeWidget.cpp b/src/vidalia/log/LogTreeWidget.cpp
index 862868a..0124a63 100644
--- a/src/vidalia/log/LogTreeWidget.cpp
+++ b/src/vidalia/log/LogTreeWidget.cpp
@@ -10,7 +10,6 @@
/*
** \file LogTreeWidget.cpp
-** \version $Id$
** \brief Contains a collection of log messages as LogTreeItems
*/
diff --git a/src/vidalia/log/LogTreeWidget.h b/src/vidalia/log/LogTreeWidget.h
index 6ec3d96..ad1dd91 100644
--- a/src/vidalia/log/LogTreeWidget.h
+++ b/src/vidalia/log/LogTreeWidget.h
@@ -10,7 +10,6 @@
/*
** \file LogTreeWidget.h
-** \version $Id$
** \brief Contains a collection of log messages as LogTreeItems
*/
diff --git a/src/vidalia/log/MessageLog.cpp b/src/vidalia/log/MessageLog.cpp
index 4c517e9..e15799e 100644
--- a/src/vidalia/log/MessageLog.cpp
+++ b/src/vidalia/log/MessageLog.cpp
@@ -10,7 +10,6 @@
/*
** \file MessageLog.cpp
-** \version $Id$
** \brief Displays log messages and message log settings
*/
diff --git a/src/vidalia/log/MessageLog.h b/src/vidalia/log/MessageLog.h
index b72f04f..3462ae1 100644
--- a/src/vidalia/log/MessageLog.h
+++ b/src/vidalia/log/MessageLog.h
@@ -10,7 +10,6 @@
/*
** \file MessageLog.h
-** \version $Id$
** \brief Displays log messages and message log settings
*/
diff --git a/src/vidalia/log/StatusEventItem.cpp b/src/vidalia/log/StatusEventItem.cpp
index 85ff2c8..d42823f 100644
--- a/src/vidalia/log/StatusEventItem.cpp
+++ b/src/vidalia/log/StatusEventItem.cpp
@@ -10,7 +10,6 @@
/*
** \file StatusEventItem.cpp
-** \version $Id$
** \brief Represents a single status event item in a StatusEventWidget
*/
diff --git a/src/vidalia/log/StatusEventItem.h b/src/vidalia/log/StatusEventItem.h
index fdc77e1..f70f711 100644
--- a/src/vidalia/log/StatusEventItem.h
+++ b/src/vidalia/log/StatusEventItem.h
@@ -10,7 +10,6 @@
/*
** \file StatusEventItem.cpp
-** \version $Id$
** \brief Represents a single status event item in a StatusEventWidget
*/
diff --git a/src/vidalia/log/StatusEventItemDelegate.cpp b/src/vidalia/log/StatusEventItemDelegate.cpp
index a043ea6..b8852eb 100644
--- a/src/vidalia/log/StatusEventItemDelegate.cpp
+++ b/src/vidalia/log/StatusEventItemDelegate.cpp
@@ -10,7 +10,6 @@
/*
** \file StatusEventItemDelegate.cpp
-** \version $Id$
** \brief Handles custom painting of items in a StatusEventWidget
*/
diff --git a/src/vidalia/log/StatusEventItemDelegate.h b/src/vidalia/log/StatusEventItemDelegate.h
index 3f20f81..c4eb244 100644
--- a/src/vidalia/log/StatusEventItemDelegate.h
+++ b/src/vidalia/log/StatusEventItemDelegate.h
@@ -10,7 +10,6 @@
/*
** \file StatusEventItemDelegate.h
-** \version $Id$
** \brief Handles custom painting of items in a StatusEventWidget
*/
diff --git a/src/vidalia/log/StatusEventWidget.cpp b/src/vidalia/log/StatusEventWidget.cpp
index 94d1416..9fd4dbc 100644
--- a/src/vidalia/log/StatusEventWidget.cpp
+++ b/src/vidalia/log/StatusEventWidget.cpp
@@ -10,7 +10,6 @@
/*
** \file StatusEventWidget.h
-** \version $Id$
** \brief Displays information on Tor status events
*/
diff --git a/src/vidalia/log/StatusEventWidget.h b/src/vidalia/log/StatusEventWidget.h
index e73062b..ee0130f 100644
--- a/src/vidalia/log/StatusEventWidget.h
+++ b/src/vidalia/log/StatusEventWidget.h
@@ -10,7 +10,6 @@
/*
** \file StatusEventWidget.h
-** \version $Id$
** \brief Displays information on Tor status events
*/
diff --git a/src/vidalia/main.cpp b/src/vidalia/main.cpp
index be0fc7f..acb9d66 100644
--- a/src/vidalia/main.cpp
+++ b/src/vidalia/main.cpp
@@ -10,7 +10,6 @@
/*
** \file main.cpp
-** \version $Id$
** \brief Main Vidalia entry point
*/
diff --git a/src/vidalia/network/CircuitItem.cpp b/src/vidalia/network/CircuitItem.cpp
index 48a4e73..bca061e 100644
--- a/src/vidalia/network/CircuitItem.cpp
+++ b/src/vidalia/network/CircuitItem.cpp
@@ -10,7 +10,6 @@
/*
** \file CircuitItem.cpp
-** \version $Id$
** \brief Item representing a Tor circuit and its status
*/
diff --git a/src/vidalia/network/CircuitItem.h b/src/vidalia/network/CircuitItem.h
index 68e62aa..b188098 100644
--- a/src/vidalia/network/CircuitItem.h
+++ b/src/vidalia/network/CircuitItem.h
@@ -10,7 +10,6 @@
/*
** \file CircuitItem.h
-** \version $Id$
** \brief List item representing a Tor circuit and its status
*/
diff --git a/src/vidalia/network/CircuitListWidget.cpp b/src/vidalia/network/CircuitListWidget.cpp
index db3b802..a0af5e7 100644
--- a/src/vidalia/network/CircuitListWidget.cpp
+++ b/src/vidalia/network/CircuitListWidget.cpp
@@ -10,7 +10,6 @@
/*
** \file CircuitListWidget.cpp
-** \version $Id$
** \brief Collection of Tor circuits as CircuitItems
*/
diff --git a/src/vidalia/network/CircuitListWidget.h b/src/vidalia/network/CircuitListWidget.h
index d00dac7..9bfdfec 100644
--- a/src/vidalia/network/CircuitListWidget.h
+++ b/src/vidalia/network/CircuitListWidget.h
@@ -10,7 +10,6 @@
/*
** \file CircuitListWidget.h
-** \version $Id$
** \brief Collection of Tor circuits as CircuitItems
*/
diff --git a/src/vidalia/network/CountryInfo.cpp b/src/vidalia/network/CountryInfo.cpp
index fec48b3..dd6b998 100644
--- a/src/vidalia/network/CountryInfo.cpp
+++ b/src/vidalia/network/CountryInfo.cpp
@@ -10,7 +10,6 @@
/*
** \file CountryInfo.cpp
-** \version $Id$
** \brief Provides a method to look up a localized country name given its
** ISO 3166 2-letter country code.
*/
diff --git a/src/vidalia/network/CountryInfo.h b/src/vidalia/network/CountryInfo.h
index 354cc58..30a8207 100644
--- a/src/vidalia/network/CountryInfo.h
+++ b/src/vidalia/network/CountryInfo.h
@@ -10,7 +10,6 @@
/*
** \file CountryInfo.h
-** \version $Id$
** \brief Provides a method to look up a localized country name given its
** ISO 3166-1 2-letter country code.
*/
diff --git a/src/vidalia/network/GeoIpDatabase.cpp b/src/vidalia/network/GeoIpDatabase.cpp
index e2183e0..3f496c7 100644
--- a/src/vidalia/network/GeoIpDatabase.cpp
+++ b/src/vidalia/network/GeoIpDatabase.cpp
@@ -10,7 +10,6 @@
/*
** \file GeoIpDatabase.cpp
-** \version $Id$
** \brief Interface to a local MaxMind GeoIP database
*/
diff --git a/src/vidalia/network/GeoIpDatabase.h b/src/vidalia/network/GeoIpDatabase.h
index f5e8690..5b8a6db 100644
--- a/src/vidalia/network/GeoIpDatabase.h
+++ b/src/vidalia/network/GeoIpDatabase.h
@@ -10,7 +10,6 @@
/*
** \file GeoIpDatabase.h
-** \version $Id$
** \brief Interface to a local MaxMind GeoIP database.
*/
diff --git a/src/vidalia/network/GeoIpRecord.cpp b/src/vidalia/network/GeoIpRecord.cpp
index 0516f6c..8a37813 100644
--- a/src/vidalia/network/GeoIpRecord.cpp
+++ b/src/vidalia/network/GeoIpRecord.cpp
@@ -10,7 +10,6 @@
/*
** \file GeoIpRecord.cpp
-** \version $Id$
** \brief Associates an IP with a geographic location
*/
diff --git a/src/vidalia/network/GeoIpRecord.h b/src/vidalia/network/GeoIpRecord.h
index 594ca2a..bf254e9 100644
--- a/src/vidalia/network/GeoIpRecord.h
+++ b/src/vidalia/network/GeoIpRecord.h
@@ -10,7 +10,6 @@
/*
** \file GeoIpRecord.h
-** \version $Id$
** \brief Associates an IP with a geographic location
*/
diff --git a/src/vidalia/network/GeoIpResolver.cpp b/src/vidalia/network/GeoIpResolver.cpp
index 85ae7ff..45e09e6 100644
--- a/src/vidalia/network/GeoIpResolver.cpp
+++ b/src/vidalia/network/GeoIpResolver.cpp
@@ -10,7 +10,6 @@
/*
** \file GeoIpResolver.cpp
-** \version $Id$
** \brief Retrieves GeoIP information either from Tor or from a local
** database and returns the result.
*/
diff --git a/src/vidalia/network/GeoIpResolver.h b/src/vidalia/network/GeoIpResolver.h
index abbbc9e..b0bbab9 100644
--- a/src/vidalia/network/GeoIpResolver.h
+++ b/src/vidalia/network/GeoIpResolver.h
@@ -10,7 +10,6 @@
/*
G** \file GeoIpResolver.h
-** \version $Id$
** \brief Retrieves GeoIP information either from Tor or from a local
** database and returns the result.
*/
diff --git a/src/vidalia/network/NetViewer.cpp b/src/vidalia/network/NetViewer.cpp
index e637124..2501537 100644
--- a/src/vidalia/network/NetViewer.cpp
+++ b/src/vidalia/network/NetViewer.cpp
@@ -10,7 +10,6 @@
/*
** \file NetViewer.cpp
-** \version $Id$
** \brief Displays a map of the Tor network and the user's circuits
*/
diff --git a/src/vidalia/network/NetViewer.h b/src/vidalia/network/NetViewer.h
index 1b3b115..e5c7208 100644
--- a/src/vidalia/network/NetViewer.h
+++ b/src/vidalia/network/NetViewer.h
@@ -10,7 +10,6 @@
/*
** \file NetViewer.h
-** \version $Id$
** \brief Displays a map of the Tor network and the user's circuits
*/
diff --git a/src/vidalia/network/RouterDescriptorView.cpp b/src/vidalia/network/RouterDescriptorView.cpp
index 0f79795..63c3102 100644
--- a/src/vidalia/network/RouterDescriptorView.cpp
+++ b/src/vidalia/network/RouterDescriptorView.cpp
@@ -10,7 +10,6 @@
/*
** \file RouterDescriptorView.cpp
-** \version $Id$
** \brief Formats and displays a router descriptor as HTML
*/
diff --git a/src/vidalia/network/RouterDescriptorView.h b/src/vidalia/network/RouterDescriptorView.h
index 70aa96a..1a77412 100644
--- a/src/vidalia/network/RouterDescriptorView.h
+++ b/src/vidalia/network/RouterDescriptorView.h
@@ -10,7 +10,6 @@
/*
** \file RouterDescriptorView.h
-** \version $Id$
** \brief Formats and displays a router descriptor as HTML
*/
diff --git a/src/vidalia/network/RouterInfoDialog.cpp b/src/vidalia/network/RouterInfoDialog.cpp
index 1d89180..935a1e3 100644
--- a/src/vidalia/network/RouterInfoDialog.cpp
+++ b/src/vidalia/network/RouterInfoDialog.cpp
@@ -10,7 +10,6 @@
/*
** \file RouterInfoDialog.cpp
-** \version $Id$
** \brief Displays detailed information about a particular router
*/
diff --git a/src/vidalia/network/RouterInfoDialog.h b/src/vidalia/network/RouterInfoDialog.h
index 0dbe3f8..ac09ea3 100644
--- a/src/vidalia/network/RouterInfoDialog.h
+++ b/src/vidalia/network/RouterInfoDialog.h
@@ -10,7 +10,6 @@
/*
** \file RouterInfoDialog.h
-** \version $Id$
** \brief Displays detailed information about a particular router
*/
diff --git a/src/vidalia/network/RouterListItem.cpp b/src/vidalia/network/RouterListItem.cpp
index 542184c..904a3f7 100644
--- a/src/vidalia/network/RouterListItem.cpp
+++ b/src/vidalia/network/RouterListItem.cpp
@@ -10,7 +10,6 @@
/*
** \file RouterListItem.cpp
-** \version $Id$
** \brief Item representing a single router and status in a RouterListWidget
*/
diff --git a/src/vidalia/network/RouterListItem.h b/src/vidalia/network/RouterListItem.h
index d773b91..ea423a3 100644
--- a/src/vidalia/network/RouterListItem.h
+++ b/src/vidalia/network/RouterListItem.h
@@ -10,7 +10,6 @@
/*
** \file RouterListItem.h
-** \version $Id$
** \brief Item representing a single router and status in a RouterListWidget
*/
diff --git a/src/vidalia/network/RouterListWidget.cpp b/src/vidalia/network/RouterListWidget.cpp
index c3d07a8..ce34355 100644
--- a/src/vidalia/network/RouterListWidget.cpp
+++ b/src/vidalia/network/RouterListWidget.cpp
@@ -10,7 +10,6 @@
/*
** \file RouterListWidget.cpp
-** \version $Id$
** \brief Displays a list of Tor servers and their status
*/
diff --git a/src/vidalia/network/RouterListWidget.h b/src/vidalia/network/RouterListWidget.h
index f62b5ae..34dfd95 100644
--- a/src/vidalia/network/RouterListWidget.h
+++ b/src/vidalia/network/RouterListWidget.h
@@ -10,7 +10,6 @@
/*
** \file RouterListWidget.h
-** \version $Id$
** \brief Displays a list of Tor servers and their status
*/
diff --git a/src/vidalia/network/StreamItem.cpp b/src/vidalia/network/StreamItem.cpp
index bd15fb3..5c9fff9 100644
--- a/src/vidalia/network/StreamItem.cpp
+++ b/src/vidalia/network/StreamItem.cpp
@@ -10,7 +10,6 @@
/*
** \file StreamItem.cpp
-** \version $Id$
** \brief Item representing a stream through Tor and its status
*/
diff --git a/src/vidalia/network/StreamItem.h b/src/vidalia/network/StreamItem.h
index c638ddf..9390469 100644
--- a/src/vidalia/network/StreamItem.h
+++ b/src/vidalia/network/StreamItem.h
@@ -10,7 +10,6 @@
/*
** \file StreamItem.h
-** \version $Id$
** \brief Item representing a stream through Tor and its status
*/
diff --git a/src/vidalia/network/TorMapImageView.cpp b/src/vidalia/network/TorMapImageView.cpp
index 7df91c5..dbcf634 100644
--- a/src/vidalia/network/TorMapImageView.cpp
+++ b/src/vidalia/network/TorMapImageView.cpp
@@ -10,7 +10,6 @@
/*
** \file TorMapImageView.cpp
-** \version $Id$
** \brief Displays Tor servers and circuits on a map of the world
*/
diff --git a/src/vidalia/network/TorMapImageView.h b/src/vidalia/network/TorMapImageView.h
index 2cc5227..47f08d8 100644
--- a/src/vidalia/network/TorMapImageView.h
+++ b/src/vidalia/network/TorMapImageView.h
@@ -10,7 +10,6 @@
/*
** \file TorMapImageView.h
-** \version $Id$
** \brief Displays Tor servers and circuits on a map of the world
*/
diff --git a/src/vidalia/network/TorMapWidget.cpp b/src/vidalia/network/TorMapWidget.cpp
index 43440f9..226ee17 100644
--- a/src/vidalia/network/TorMapWidget.cpp
+++ b/src/vidalia/network/TorMapWidget.cpp
@@ -10,7 +10,6 @@
/*
** \file TorMapWidget.cpp
-** \version $Id$
** \brief Displays Tor servers and circuits on a map of the world
*/
diff --git a/src/vidalia/network/TorMapWidget.h b/src/vidalia/network/TorMapWidget.h
index 5aee666..0671874 100644
--- a/src/vidalia/network/TorMapWidget.h
+++ b/src/vidalia/network/TorMapWidget.h
@@ -10,7 +10,6 @@
/*
** \file TorMapWidget.h
-** \version $Id$
** \brief Displays Tor servers and circuits on a map of the world
*/
diff --git a/src/vidalia/network/TorMapWidgetPopupMenu.cpp b/src/vidalia/network/TorMapWidgetPopupMenu.cpp
index 7f7348a..2bc9ae5 100644
--- a/src/vidalia/network/TorMapWidgetPopupMenu.cpp
+++ b/src/vidalia/network/TorMapWidgetPopupMenu.cpp
@@ -10,7 +10,6 @@
/*
** \file TorMapWidgetPopupMenu.cpp
-** \version $Id$
** \brief Popup menu displayed when the user mouse clicks on a map placemark
*/
diff --git a/src/vidalia/network/TorMapWidgetPopupMenu.h b/src/vidalia/network/TorMapWidgetPopupMenu.h
index 52b7947..b892a1e 100644
--- a/src/vidalia/network/TorMapWidgetPopupMenu.h
+++ b/src/vidalia/network/TorMapWidgetPopupMenu.h
@@ -10,7 +10,6 @@
/*
** \file TorMapWidgetPopupMenu.h
-** \version $Id$
** \brief Popup menu displayed when the user mouse clicks on a map placemark
*/
diff --git a/src/vidalia/network/ZImageView.cpp b/src/vidalia/network/ZImageView.cpp
index e07558c..cf712a7 100644
--- a/src/vidalia/network/ZImageView.cpp
+++ b/src/vidalia/network/ZImageView.cpp
@@ -10,7 +10,6 @@
/*
** \file ZImageView.cpp
-** \version $Id$
** \brief Displays an image and allows zooming and panning
*/
diff --git a/src/vidalia/network/ZImageView.h b/src/vidalia/network/ZImageView.h
index b577a25..37b53ea 100644
--- a/src/vidalia/network/ZImageView.h
+++ b/src/vidalia/network/ZImageView.h
@@ -10,7 +10,6 @@
/*
** \file ZImageView.h
-** \version $Id$
** \brief Displays an image and allows zooming and panning
*/
1
0