- tor-commits - lists.torproject.org

[torspec/master] renumber CONF_CHANGED section
by arma＠torproject.org 29 Aug '11

29 Aug '11

commit 60118160829d7d01b70c04004aa39c4ef62cb089 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Aug 28 19:38:31 2011 -0400 renumber CONF_CHANGED section --- control-spec.txt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index a5550d3..61c858a 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1831,7 +1831,7 @@ 650-CLIENTS_SEEN TimeStarted="2008-12-25 23:50:43" CountrySummary=us=16,de=8,uk=8 -4.1.15. New consensus networkstatus has arrived. +4.1.15. New consensus networkstatus has arrived The syntax is: "650" "+" "NEWCONSENSUS" CRLF 1*NetworkStatus "." CRLF "650" SP @@ -1844,7 +1844,7 @@ [First added in 0.2.1.13-alpha] -4.1.16. New circuit buildtime has been set. +4.1.16. New circuit buildtime has been set The syntax is: "650" SP "BUILDTIMEOUT_SET" SP Type SP "TOTAL_TIMES=" Total SP @@ -1902,7 +1902,7 @@ [First added in 0.2.3.1-alpha] -4.1.17. Configuration changed +4.1.18. Configuration changed The syntax is: StartReplyLine *(MidReplyLine) EndReplyLine

1 0

[torspec/master] Clarify multi-line commands in control spec
by nickm＠torproject.org 29 Aug '11

29 Aug '11

commit 361171e63145ecaa5c760ad3ec927a0dc9eec83f Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Aug 28 19:35:39 2011 -0400 Clarify multi-line commands in control spec --- control-spec.txt | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 2dd9a92..55f7654 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -103,11 +103,16 @@ 2.2. Commands from controller to Tor - Command = Keyword Arguments CRLF / "+" Keyword Arguments CRLF Data + Command = Keyword Arguments CRLF / "+" Keyword Arguments CRLF CmdData Keyword = 1*ALPHA Arguments = *(SP / VCHAR) - Specific commands and their arguments are described below in section 3. + A command is either a single line containing a Keyword and arguments, or a + multiline command whose initial keyword begins with +, and whose data + section ends with a single "." on a line of its own. (We use a special + character to distinguish multiline commands so that Tor can correctly parse + multi-line commands that it does not recognize.) Specific commands and + their arguments are described below in section 3. 2.3. Replies from Tor to the controller @@ -175,11 +180,11 @@ Address = ip4-address / ip6-address / hostname (XXXX Define these) - ; A "Data" section is a sequence of octets concluded by the terminating + ; A "CmdData" section is a sequence of octets concluded by the terminating ; sequence CRLF "." CRLF. The terminating sequence may not appear in the ; body of the data. Leading periods on lines in the data are escaped with ; an additional leading period as in RFC 2821 section 4.5.2. - Data = *DataLine "." CRLF + CmdData = *DataLine "." CRLF DataLine = CRLF / "." 1*LineItem CRLF / NonDotItem *LineItem CRLF LineItem = NonCR / 1*CR NonCRLF NonDotItem = NonDotCR / 1*CR NonCRLF

1 0

[torspec/master] Fix ambiguity in splitting keyword from arguments
by nickm＠torproject.org 29 Aug '11

29 Aug '11

commit f30a4da9abe66ddec3fc92d0d8437fb89bfe65af Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Aug 28 19:37:49 2011 -0400 Fix ambiguity in splitting keyword from arguments --- control-spec.txt | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 55f7654..a5550d3 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -103,9 +103,9 @@ 2.2. Commands from controller to Tor - Command = Keyword Arguments CRLF / "+" Keyword Arguments CRLF CmdData + Command = Keyword OptArguments CRLF / "+" Keyword OptArguments CRLF CmdData Keyword = 1*ALPHA - Arguments = *(SP / VCHAR) + OptArguments = [ SP *(SP / VCHAR) ] A command is either a single line containing a Keyword and arguments, or a multiline command whose initial keyword begins with +, and whose data @@ -927,7 +927,7 @@ AuthLine = "250-AUTH" SP "METHODS=" AuthMethod *("," AuthMethod) *(SP "COOKIEFILE=" AuthCookieFile) CRLF - VersionLine = "250-VERSION" SP "Tor=" TorVersion [SP Arguments] CRLF + VersionLine = "250-VERSION" SP "Tor=" TorVersion OptArguments CRLF AuthMethod = "NULL" / ; No authentication is required @@ -937,7 +937,7 @@ AuthCookieFile = QuotedString TorVersion = QuotedString - OtherLine = "250-" Keyword [SP Arguments] CRLF + OtherLine = "250-" Keyword OptArguments CRLF PIVERSION: 1*DIGIT @@ -1370,9 +1370,9 @@ StatusKeyword = 1*(ALNUM / "_") StatusValue = 1*(ALNUM / '_') / QuotedString - Action is a string, and Arguments is a series of keyword=value - pairs on the same line. Values may be space-terminated strings, - or quoted strings. + StatusAction is a string, and StatusArguments is a series of + keyword=value pairs on the same line. Values may be space-terminated + strings, or quoted strings. These events are always produced with EXTENDED_EVENTS and VERBOSE_NAMES; see the explanations in the USEFEATURE section

1 0

r24974: {website} bump all package versions to tor 0.2.2.32 (website/trunk/include)
by Erinn Clark 28 Aug '11

28 Aug '11

Author: erinn Date: 2011-08-28 21:28:13 +0000 (Sun, 28 Aug 2011) New Revision: 24974 Modified: website/trunk/include/versions.wmi Log: bump all package versions to tor 0.2.2.32 Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-08-28 19:00:52 UTC (rev 24973) +++ website/trunk/include/versions.wmi 2011-08-28 21:28:13 UTC (rev 24974) @@ -1,53 +1,53 @@ <define-tag version-stable whitespace=delete>0.2.2.32</define-tag> <define-tag version-alpha whitespace=delete>0.2.3.2-alpha</define-tag> -<define-tag version-win32-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-win32-stable whitespace=delete>0.2.2.32</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.2.32</define-tag> -<define-tag version-win32-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-win32-bundle-stable whitespace=delete>0.2.2.32</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.32</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.30-rc-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.32-<version-vidalia-stable></define-tag> -<define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.2.32</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.32</define-tag> -<define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.2.32</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.32</define-tag> -<define-tag version-osx-x86-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-osx-x86-stable whitespace=delete>0.2.2.32</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.32</define-tag> -<define-tag version-osx-ppc-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-osx-ppc-stable whitespace=delete>0.2.2.32</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.32</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>1.3.27</define-tag> -<define-tag version-torbrowser-tor whitespace=delete>0.2.1.30</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>1.3.28</define-tag> +<define-tag version-torbrowser-tor whitespace=delete>0.2.2.32</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.13-stable, zlib-1.2.5, openssl-1.0.0d</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>3.6.20</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> -<define-tag version-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> +<define-tag version-torbrowser-vidalia whitespace=delete>0.2.14</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.13</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.13</define-tag> -<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.14</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.14</define-tag> +<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.32</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.13, zlib-1.2.5, openssl-0.9.8p</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.20</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> -<define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> +<define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.14</define-tag> -<define-tag version-torbrowserbundleosx whitespace=delete>1.0.23</define-tag> -<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-torbrowserbundleosx whitespace=delete>1.0.24</define-tag> +<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.32</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.20</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-osx-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag> -<define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> +<define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.14</define-tag> -<define-tag version-torbrowserbundleff5 whitespace=delete>2.2.30-1</define-tag> +<define-tag version-torbrowserbundleff5 whitespace=delete>2.2.32-1</define-tag> <define-tag version-vidalia-stable whitespace=delete>0.2.14</define-tag> @@ -60,18 +60,18 @@ <define-tag package-win32-stable whitespace=delete>/dist/win32/tor-<version-win32-stable>-win32.exe</define-tag> <define-tag package-win32-alpha whitespace=delete>/dist/win32/tor-<version-win32-alpha>-win32.exe</define-tag> -<define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.12.exe</define-tag> +<define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> <define-tag package-win32-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-stable></define-tag> -<define-tag file-win32-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.12.exe</define-tag> +<define-tag file-win32-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> <define-tag package-win32-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> -<define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.12-i386.dmg</define-tag> +<define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.14-i386.dmg</define-tag> <define-tag package-osx-x86-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-osx-x86-bundle-stable></define-tag> -<define-tag file-osx-x86-bundle-alpha whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-alpha>-0.2.12-i386.dmg</define-tag> +<define-tag file-osx-x86-bundle-alpha whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-alpha>-0.2.14-i386.dmg</define-tag> <define-tag package-osx-x86-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-osx-x86-bundle-alpha></define-tag> -<define-tag package-osx-ppc-bundle-stable whitespace=delete>/dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-stable>-0.2.12-ppc.dmg</define-tag> -<define-tag package-osx-ppc-bundle-alpha whitespace=delete>/dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-alpha>-0.2.12-ppc.dmg</define-tag> +<define-tag package-osx-ppc-bundle-stable whitespace=delete>/dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-stable>-0.2.14-ppc.dmg</define-tag> +<define-tag package-osx-ppc-bundle-alpha whitespace=delete>/dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-alpha>-0.2.14-ppc.dmg</define-tag> <define-tag package-osx-x86-stable whitespace=delete>/dist/osx-x86/Tor-<version-osx-stable>-i386-Bundle.dmg</define-tag> <define-tag package-osx-x86-alpha whitespace=delete>/dist/osx-x86/Tor-<version-osx-alpha>-i386-Bundle.dmg</define-tag>

1 0

[torbutton/master] Fix permissions and missing directory in build docuscript.
by mikeperry＠torproject.org 28 Aug '11

28 Aug '11

commit b049877222dfa9990246836098dab2bf45bc569e Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Aug 28 13:25:51 2011 -0700 Fix permissions and missing directory in build docuscript. --- README.RELEASE | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/README.RELEASE b/README.RELEASE index c77e952..b485f41 100644 --- a/README.RELEASE +++ b/README.RELEASE @@ -44,6 +44,7 @@ cd torbutton-release git tag -v ${VERSION} # verify signature against git protocol haaAAXXXX git checkout -b tag-${VERSION} ${VERSION} + mkdir ./pkg sh makexpi.sh #. SHA1 + Sign the .xpi @@ -53,6 +54,7 @@ #. Upload .xpi to website + chmod 664 ./pkg/torbutton-${VERSION}.xpi* torsocks scp ./pkg/torbutton-${VERSION}.xpi* vescum:/srv/www-master.torproject.org/htdocs/dist/torbutton/ torsocks scp ./pkg/torbutton-${VERSION}.xpi vescum:/srv/www-master.torproject.org/htdocs/dist/torbutton/torbutton-curre… torsocks scp ./pkg/torbutton-${VERSION}.xpi.asc vescum:/srv/www-master.torproject.org/htdocs/dist/torbutton/torbutton-curre…

1 0

[torbrowser/maint-2.2] add auto port selection to windows config files
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 9f30b4174acda826297b0e75c3e25dfabc164250 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 20:42:52 2011 +0100 add auto port selection to windows config files --- build-scripts/config/torrc | 3 ++- build-scripts/config/vidalia.conf.ff | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/build-scripts/config/torrc b/build-scripts/config/torrc index 29154fb..143c71a 100644 --- a/build-scripts/config/torrc +++ b/build-scripts/config/torrc @@ -8,5 +8,6 @@ GeoIPFile .\Data\Tor\geoip Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. -SocksPort 9050 +SocksPort auto SocksListenAddress 127.0.0.1 +ControlPort auto diff --git a/build-scripts/config/vidalia.conf.ff b/build-scripts/config/vidalia.conf.ff index 03ed00a..d66f53f 100644 --- a/build-scripts/config/vidalia.conf.ff +++ b/build-scripts/config/vidalia.conf.ff @@ -7,3 +7,5 @@ LanguageCode=en ControlPort=9051 TorExecutable=.\\App\\tor.exe Torrc=.\\Data\\Tor\\torrc +AutoControl=true +DataDirectory=.\\Data\\Tor

1 0

[torbrowser/maint-2.2] use the right paths for adding tbb version in prefs.js on windows and linux
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 1907b9e7455eaaa1fbd0aed614aeab55b2d6fdae Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 20:37:03 2011 +0100 use the right paths for adding tbb version in prefs.js on windows and linux --- build-scripts/linux.mk | 3 ++- build-scripts/windows.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 85f8830..904aed7 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -468,5 +468,6 @@ update-extension-pref: sed -i -e "s/SHPONKA/langpack-$(LANGCODE)@firefox.mozilla.org:$$ext_ver/g" $(BUNDLE)/Data/profile/prefs.js write-tbb-version: - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/App/Firefox/defaults/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/Data/profile/prefs.js diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 2016242..da1384e 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -441,7 +441,8 @@ apply-prefs: cp $(DEST)/FirefoxPortable/Data/profile/prefs.js $(CONFIG_SRC) write-tbb-version: - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js ## Export the source code of the bundle SRCNAME=$(COMPRESSED_NAME)

1 0

r24973: {website} update some of the vidalia macros (website/trunk/projects/en)
by Erinn Clark 28 Aug '11

28 Aug '11

Author: erinn Date: 2011-08-28 19:00:52 +0000 (Sun, 28 Aug 2011) New Revision: 24973 Modified: website/trunk/projects/en/vidalia.wml Log: update some of the vidalia macros Modified: website/trunk/projects/en/vidalia.wml =================================================================== --- website/trunk/projects/en/vidalia.wml 2011-08-28 16:59:59 UTC (rev 24972) +++ website/trunk/projects/en/vidalia.wml 2011-08-28 19:00:52 UTC (rev 24973) @@ -55,26 +55,26 @@ </p> <h4>Stable Releases</h4> - <p> The most recent stable release is: 0.2.12</p> + <p> The most recent stable release is: <version-vidalia-stable></p> <ul> <li> - <a href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.30-rc-0.2.12.exe">Windows Installer</a> - (<a href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.30-rc-0.2.12.exe.asc">sig</a>) + <a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>.exe">Windows Installer</a> + (<a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>.exe.asc">sig</a>) </li> <li> - <a href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.30-rc-0.2.12-i386.dmg">Mac OS X x86 Only</a> - (<a href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.30-rc-0.2.12-i386.dmg.asc">sig</a>) + <a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>-i386.dmg">Mac OS X x86 Only</a> + (<a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>-i386.dmg.asc">sig</a>) </li> <li> - <a href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.30-rc-0.2.12-i386.dmg">Mac OS X PPC Only</a> - (<a href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.30-rc-0.2.12-i386.dmg.asc">sig</a>) + <a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>-i386.dmg">Mac OS X PPC Only</a> + (<a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>-i386.dmg.asc">sig</a>) </li> <li> <a href="<page docs/debian-vidalia>">Instructions for Debian/Ubuntu/Knoppix Repositories</a> </li> <li> - <a href="../dist/vidalia/vidalia-0.2.12.tar.gz">Source Tarball</a> - (<a href="../dist/vidalia/vidalia-0.2.12.tar.gz.sig">sig</a>) + <a href="../dist/vidalia/vidalia-<version-vidalia-stable>.tar.gz">Source Tarball</a> + (<a href="../dist/vidalia/vidalia-<version-vidalia-stable>.tar.gz.asc">sig</a>) </li> </ul>

1 0

[torbrowser/maint-2.2] give windows an updated prefs.js as well
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 0eddd4ad3c37bd8a49030e65bbff0367534b9865 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 19:22:15 2011 +0100 give windows an updated prefs.js as well --- build-scripts/config/windows-4.0.js | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js index 13fda1f..a9cbdc8 100644 --- a/build-scripts/config/windows-4.0.js +++ b/build-scripts/config/windows-4.0.js @@ -38,7 +38,7 @@ user_pref("browser.places.migratePostDataAnnotations", false); user_pref("browser.places.smartBookmarksVersion", 2); user_pref("browser.places.updateRecentTagsUri", false); user_pref("browser.preferences.advanced.selectedTabIndex", 0); -user_pref("browser.privatebrowsing.autostart", true); +user_pref("browser.privatebrowsing.autostart", false); user_pref("browser.rights.3.shown", true); user_pref("browser.safebrowsing.enabled", false); user_pref("browser.safebrowsing.malware.enabled", false); @@ -50,7 +50,7 @@ user_pref("browser.shell.checkDefaultBrowser", false); user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=en-US&small=1"); user_pref("browser.startup.homepage_override.buildID", "20110325121920"); user_pref("browser.startup.homepage_override.mstone", "rv:2.0"); -user_pref("browser.urlbar.autocomplete.enabled", false); +user_pref("browser.urlbar.autocomplete.enabled", true); user_pref("browser.zoom.siteSpecific", false); user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); user_pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:addons about:blank about:blocked about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: resource:"); @@ -149,6 +149,7 @@ user_pref("noscript.showTemp", false); user_pref("noscript.showTempAllowPage", false); user_pref("noscript.showTempToPerm", false); user_pref("noscript.showUntrusted", false); +user_pref("noscript.STS.enabled", false); user_pref("noscript.subscription.lastCheck", -142148139); user_pref("noscript.temp", ""); user_pref("noscript.untrusted", "");

1 0

[torbrowser/maint-2.2] update windows and linux to 2.2.32-1 as well
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 17c0d034c0e078a9a4e6353a2e7a8279d4f3a72b Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 19:21:48 2011 +0100 update windows and linux to 2.2.32-1 as well --- README.LINUX-2.2 | 6 +++--- README.WIN-2.2 | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 9 +++++++++ changelog.win-2.2 | 11 ++++++++++- 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 47f2684..176ee30 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -4,10 +4,10 @@ Tor Browser Bundle for GNU/Linux Included applications --------------------- -Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) +Vidalia 0.2.14 (with Qt 4.6.2) +Tor 0.2.2.32 (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) Firefox (Aurora) 6.0 - \_ Torbutton 1.4.0 + \_ Torbutton 1.4.1 |_ NoScript 2.1.2.6 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 519c64f..5ab55a0 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for Windows Included applications --------------------- -Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) -FirefoxPortable 5.0.1 +Vidalia 0.2.14 (with Qt 4.6.2) +Tor 0.2.2.32 (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) +FirefoxPortable 6.0 \_ Firefox (Aurora) 6.0 - \_ Torbutton 1.4.0 + \_ Torbutton 1.4.1 |_ NoScript 2.1.2.6 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 1a52f6a..294b2c6 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -138,7 +138,7 @@ NAME="Tor Browser" DISTDIR=tbbwin-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-2-alpha +VERSION=$(RELEASE_VER)-1-alpha DEFAULT_COMPRESSED_BASENAME=tor-browser-$(VERSION) IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION) DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 1d29228..6d49e4a 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.32-1) alpha; suite=linux + + * Update Tor to 0.2.2.32 + * Update Vidalia to 0.2.14 + * Update Torbutton to 1.4.1 + * Enable automatic port choosing (closes: #2264) + + -- Erinn Clark <erinn(a)torproject.org> Sun Aug 28 17:20:46 BST 2011 + Tor Browser Bundle (2.2.31-2) alpha; suite=linux * Fix x86_64 bundle to have the right libraries and binaries (closes: #3773) diff --git a/changelog.win-2.2 b/changelog.win-2.2 index bc070ec..96eae99 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,4 +1,13 @@ -Tor Browser Bundle (2.2.30-1) alpha; suite=windows +Tor Browser Bundle (2.2.32-1) alpha; suite=windows + + * Update Tor to 0.2.2.32 + * Update Vidalia to 0.2.14 + * Update Torbutton to 1.4.1 + * Enable automatic port choosing (closes: #2264) + + -- Erinn Clark <erinn(a)torproject.org> Sun Aug 28 17:20:46 BST 2011 + +Tor Browser Bundle (2.2.31-1) alpha; suite=windows * Update Tor to 0.2.2.31-rc * Update Firefox to 6.0

1 0