- tor-commits - lists.torproject.org

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 29 Jul '12

29 Jul '12

commit 1f74fb9dc8d986956d154dcaae2efcdee9a769c3 Merge: 77b5803 6026825 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Jul 30 00:50:35 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)

1 0

r25732: {website} add the osx 64-bit tbb to versions and torbrowser download p (in website/trunk: include projects/en)
by Erinn Clark 29 Jul '12

29 Jul '12

Author: erinn Date: 2012-07-29 20:22:10 +0000 (Sun, 29 Jul 2012) New Revision: 25732 Modified: website/trunk/include/versions.wmi website/trunk/projects/en/torbrowser.wml Log: add the osx 64-bit tbb to versions and torbrowser download page Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-07-29 20:18:44 UTC (rev 25731) +++ website/trunk/include/versions.wmi 2012-07-29 20:22:10 UTC (rev 25732) @@ -51,6 +51,7 @@ <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.6</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.20</define-tag> <define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.3.19-alpha-1</define-tag> +<define-tag version-torbrowserbundleosx64alpha whitespace=delete>2.3.19-alpha-1</define-tag> <define-tag version-vidalia-stable whitespace=delete>0.2.20</define-tag> <define-tag version-vidalia-alpha whitespace=delete>0.3.1</define-tag> Modified: website/trunk/projects/en/torbrowser.wml =================================================================== --- website/trunk/projects/en/torbrowser.wml 2012-07-29 20:18:44 UTC (rev 25731) +++ website/trunk/projects/en/torbrowser.wml 2012-07-29 20:22:10 UTC (rev 25732) @@ -479,6 +479,7 @@ <li><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz">Linux Tor Browser Bundle alpha (32-bit)</a> (<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz.asc">signature</a>)</li> <li><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz">Linux Tor Browser Bundle alpha (64-bit)</a> (<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz.asc">signature</a>)</li> <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip">Mac OS X Tor Browser Bundle (32-bit)</a> (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip.asc">signature</a>)</li> + <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64alpha>-osx-x86_64-en-US.zip">Mac OS X Tor Browser Bundle (64-bit)</a> (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64alpha>-osx-x86_64-en-US.zip.asc">signature</a>)</li> </ul>

1 0

r25731: {website} actually update the tbb alpha release versions too (website/trunk/include)
by Erinn Clark 29 Jul '12

29 Jul '12

Author: erinn Date: 2012-07-29 20:18:44 +0000 (Sun, 29 Jul 2012) New Revision: 25731 Modified: website/trunk/include/versions.wmi Log: actually update the tbb alpha release versions too Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-07-29 20:11:09 UTC (rev 25730) +++ website/trunk/include/versions.wmi 2012-07-29 20:18:44 UTC (rev 25731) @@ -32,7 +32,7 @@ <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> <define-tag version-torbrowser-vidalia whitespace=delete>0.2.20</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlealpha whitespace=delete>2.3.12-alpha-2</define-tag> +<define-tag version-torbrowserbundlealpha whitespace=delete>2.3.19-alpha-1</define-tag> <define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.37-2</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.37-2</define-tag> @@ -41,8 +41,8 @@ <define-tag version-gnu-torbrowser-firefox whitespace=delete>10.0.6esr</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.6</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.20</define-tag> -<define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.3.12-alpha-2</define-tag> -<define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.3.12-alpha-2</define-tag> +<define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.3.19-alpha-1</define-tag> +<define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.3.19-alpha-1</define-tag> <define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.37-2</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.37-2</define-tag> @@ -50,7 +50,7 @@ <define-tag version-osx-torbrowser-firefox whitespace=delete>10.0.6esr</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.6</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.20</define-tag> -<define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.3.12-alpha-2</define-tag> +<define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.3.19-alpha-1</define-tag> <define-tag version-vidalia-stable whitespace=delete>0.2.20</define-tag> <define-tag version-vidalia-alpha whitespace=delete>0.3.1</define-tag>

1 0

r25730: {website} bump all alpha bundles to 0.2.3.19-rc, stable tbbs to 2.2.37 (website/trunk/include)
by Erinn Clark 29 Jul '12

29 Jul '12

Author: erinn Date: 2012-07-29 20:11:09 +0000 (Sun, 29 Jul 2012) New Revision: 25730 Modified: website/trunk/include/versions.wmi Log: bump all alpha bundles to 0.2.3.19-rc, stable tbbs to 2.2.37-2, and vidalia to 0.2.20 Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-07-28 19:28:09 UTC (rev 25729) +++ website/trunk/include/versions.wmi 2012-07-29 20:11:09 UTC (rev 25730) @@ -2,57 +2,57 @@ <define-tag version-alpha whitespace=delete>0.2.3.19-rc</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.2.37</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.3.15-alpha</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.3.19-rc</define-tag> <define-tag version-win32-bundle-stable whitespace=delete>0.2.2.37</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.3.15-alpha</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.3.19-rc</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.3.15-alpha-<version-vidalia-stable></define-tag> -<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.3.15-alpha-<version-vidalia-stable></define-tag> -<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.3.15-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.3.19-rc-<version-vidalia-stable></define-tag> +<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.3.19-rc-<version-vidalia-stable></define-tag> +<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.3.19-rc-<version-vidalia-stable></define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.2.37</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.3.15-alpha</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.3.19-rc</define-tag> <define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.2.37</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.3.15-alpha</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.3.19-rc</define-tag> <define-tag version-osx-x86-stable whitespace=delete>0.2.2.37</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.3.15-alpha</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.3.19-rc</define-tag> <define-tag version-osx-ppc-stable whitespace=delete>0.2.2.37</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.15-alpha</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.19-rc</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.2.37-1</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.37-2</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.2.37</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.19-stable, zlib-1.2.7, openssl-1.0.1c</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>10.0.5esr</define-tag> -<define-tag version-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>10.0.6esr</define-tag> +<define-tag version-torbrowser-torbutton whitespace=delete>1.4.6</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.19</define-tag> +<define-tag version-torbrowser-vidalia whitespace=delete>0.2.20</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> <define-tag version-torbrowserbundlealpha whitespace=delete>2.3.12-alpha-2</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.37-1</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.37-1</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.37-2</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.37-2</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.37</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.19-stable, zlib-1.2.7, openssl-1.0.1c</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>10.0.5esr</define-tag> -<define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> -<define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.19</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>10.0.6esr</define-tag> +<define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.6</define-tag> +<define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.20</define-tag> <define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.3.12-alpha-2</define-tag> <define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.3.12-alpha-2</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.37-1</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.37-1</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.37-2</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.37-2</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.37</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>10.0.5esr</define-tag> -<define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> -<define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.19</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>10.0.6esr</define-tag> +<define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.6</define-tag> +<define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.20</define-tag> <define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.3.12-alpha-2</define-tag> -<define-tag version-vidalia-stable whitespace=delete>0.2.19</define-tag> +<define-tag version-vidalia-stable whitespace=delete>0.2.20</define-tag> <define-tag version-vidalia-alpha whitespace=delete>0.3.1</define-tag> <define-tag version-androidbundle-tor whitespace=delete>0.2.3.10-alpha</define-tag> @@ -62,35 +62,35 @@ <define-tag package-androidbundle-alpha whitespace=delete>dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk</define-tag> <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-1.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.19.exe</define-tag> +<define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.20.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.17.exe</define-tag> +<define-tag file-win32-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.20.exe</define-tag> <define-tag package-win32-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> -<define-tag file-win32-bridge-bundle-stable whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-stable>-0.2.19.exe</define-tag> +<define-tag file-win32-bridge-bundle-stable whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-stable>-0.2.20.exe</define-tag> <define-tag package-win32-bridge-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-bridge-bundle-stable></define-tag> -<define-tag file-win32-bridge-bundle-alpha whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-alpha>-0.2.17-1.exe</define-tag> +<define-tag file-win32-bridge-bundle-alpha whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-alpha>-0.2.20.exe</define-tag> <define-tag package-win32-bridge-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-bridge-bundle-alpha></define-tag> -<define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-stable>-0.2.19.exe</define-tag> +<define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-stable>-0.2.20.exe</define-tag> <define-tag package-win32-relay-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-relay-bundle-stable></define-tag> -<define-tag file-win32-relay-bundle-alpha whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-alpha>-0.2.17.exe</define-tag> +<define-tag file-win32-relay-bundle-alpha whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-alpha>-0.2.20.exe</define-tag> <define-tag package-win32-relay-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-relay-bundle-alpha></define-tag> -<define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-stable>-0.2.19.exe</define-tag> +<define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-stable>-0.2.20.exe</define-tag> <define-tag package-win32-exit-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-exit-bundle-stable></define-tag> -<define-tag file-win32-exit-bundle-alpha whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-alpha>-0.2.17.exe</define-tag> +<define-tag file-win32-exit-bundle-alpha whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-alpha>-0.2.20.exe</define-tag> <define-tag package-win32-exit-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-exit-bundle-alpha></define-tag> -<define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.19-i386.dmg</define-tag> +<define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.20-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.17-i386.dmg</define-tag> +<define-tag file-osx-x86-bundle-alpha whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-alpha>-0.2.20-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.19-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.17-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.20-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.20-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

[torbrowser/maint-2.3] make sure tbb alpha vidalia configs work for vidalia 0.2.20
by erinn＠torproject.org 29 Jul '12

29 Jul '12

commit 77b5803f63bd2ef8106d4098c989e43e9fa1b27e Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Jul 29 21:05:02 2012 +0100 make sure tbb alpha vidalia configs work for vidalia 0.2.20 --- build-scripts/config/alpha/vidalia.conf.ff-linux | 17 +++++++++-------- build-scripts/config/alpha/vidalia.conf.ff-osx | 17 +++++++++-------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/build-scripts/config/alpha/vidalia.conf.ff-linux b/build-scripts/config/alpha/vidalia.conf.ff-linux index b5c6aa6..26c66be 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff-linux +++ b/build-scripts/config/alpha/vidalia.conf.ff-linux @@ -1,15 +1,16 @@ [General] +BrowserDirectory=./Firefox +BrowserExecutable=firefox InterfaceStyle=Cleanlooks LanguageCode=en -PluginPath=./Data/Vidalia/plugins +ProfileDirectory=../../Data/profile +DefaultProfileDirectory=./defaults/profile +PluginsDirectory=../../Data/profile/extensions +DefaultPluginsDirectory=./extensions [Tor] ControlPort=9051 -TorExecutable=./App/tor -Torrc=./Data/Tor/torrc +TorExecutable=./tor +Torrc=../Data/Tor/torrc AutoControl=true -DataDirectory=./Data/Tor - -[TBB] -BrowserDirectory=. -BrowserExecutable=firefox +DataDirectory=../Data/Tor diff --git a/build-scripts/config/alpha/vidalia.conf.ff-osx b/build-scripts/config/alpha/vidalia.conf.ff-osx index a02a7dc..f698d2b 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff-osx +++ b/build-scripts/config/alpha/vidalia.conf.ff-osx @@ -1,14 +1,15 @@ [General] -PluginPath=../../Library/Vidalia/plugins +BrowserDirectory=../../../ +BrowserExecutable=TorBrowser.app/Contents/MacOS/firefox-bin +ProfileDirectory=../../Library/Application Support/Firefox/Profiles/profile +DefaultProfileDirectory=TorBrowser.app/Contents/MacOS/defaults/profile +PluginsDirectory=../../MacOS/Data/plugins +DefaultPluginsDirectory=../../MacOS/Data/plugins LanguageCode=en [Tor] ControlPort=9051 -TorExecutable=../../Contents/MacOS/tor -Torrc=../../Library/Vidalia/torrc +TorExecutable=../../../tor +Torrc=../../../../../Library/Vidalia/torrc AutoControl=true -DataDirectory=../../Contents/Resources/Data/Tor - -[TBB] -BrowserDirectory=../../ -BrowserExecutable=firefox-bin +DataDirectory=../../../../Resources/Data/Tor/

1 0

[torbrowser/master] make sure tbb alpha vidalia configs work for vidalia 0.2.20
by erinn＠torproject.org 29 Jul '12

29 Jul '12

commit 77b5803f63bd2ef8106d4098c989e43e9fa1b27e Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Jul 29 21:05:02 2012 +0100 make sure tbb alpha vidalia configs work for vidalia 0.2.20 --- build-scripts/config/alpha/vidalia.conf.ff-linux | 17 +++++++++-------- build-scripts/config/alpha/vidalia.conf.ff-osx | 17 +++++++++-------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/build-scripts/config/alpha/vidalia.conf.ff-linux b/build-scripts/config/alpha/vidalia.conf.ff-linux index b5c6aa6..26c66be 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff-linux +++ b/build-scripts/config/alpha/vidalia.conf.ff-linux @@ -1,15 +1,16 @@ [General] +BrowserDirectory=./Firefox +BrowserExecutable=firefox InterfaceStyle=Cleanlooks LanguageCode=en -PluginPath=./Data/Vidalia/plugins +ProfileDirectory=../../Data/profile +DefaultProfileDirectory=./defaults/profile +PluginsDirectory=../../Data/profile/extensions +DefaultPluginsDirectory=./extensions [Tor] ControlPort=9051 -TorExecutable=./App/tor -Torrc=./Data/Tor/torrc +TorExecutable=./tor +Torrc=../Data/Tor/torrc AutoControl=true -DataDirectory=./Data/Tor - -[TBB] -BrowserDirectory=. -BrowserExecutable=firefox +DataDirectory=../Data/Tor diff --git a/build-scripts/config/alpha/vidalia.conf.ff-osx b/build-scripts/config/alpha/vidalia.conf.ff-osx index a02a7dc..f698d2b 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff-osx +++ b/build-scripts/config/alpha/vidalia.conf.ff-osx @@ -1,14 +1,15 @@ [General] -PluginPath=../../Library/Vidalia/plugins +BrowserDirectory=../../../ +BrowserExecutable=TorBrowser.app/Contents/MacOS/firefox-bin +ProfileDirectory=../../Library/Application Support/Firefox/Profiles/profile +DefaultProfileDirectory=TorBrowser.app/Contents/MacOS/defaults/profile +PluginsDirectory=../../MacOS/Data/plugins +DefaultPluginsDirectory=../../MacOS/Data/plugins LanguageCode=en [Tor] ControlPort=9051 -TorExecutable=../../Contents/MacOS/tor -Torrc=../../Library/Vidalia/torrc +TorExecutable=../../../tor +Torrc=../../../../../Library/Vidalia/torrc AutoControl=true -DataDirectory=../../Contents/Resources/Data/Tor - -[TBB] -BrowserDirectory=../../ -BrowserExecutable=firefox-bin +DataDirectory=../../../../Resources/Data/Tor/

1 0

r25729: {website} fix the location of hardkor and update the mirror status. (in website/trunk: . include)
by Andrew Lewman 28 Jul '12

28 Jul '12

Author: phobos Date: 2012-07-28 19:28:09 +0000 (Sat, 28 Jul 2012) New Revision: 25729 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: fix the location of hardkor and update the mirror status. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-07-28 01:06:05 UTC (rev 25728) +++ website/trunk/include/mirrors-table.wmi 2012-07-28 19:28:09 UTC (rev 25729) @@ -18,23 +18,6 @@ <tr> - <td>NL</td> - - <td>Amorphis</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>PT</td> <td>5ª Coluna</td> @@ -256,6 +239,23 @@ <tr> + <td>LT</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>DE</td> <td></td> @@ -273,7 +273,7 @@ <tr> - <td>US</td> + <td>FR</td> <td></td> @@ -630,23 +630,6 @@ <tr> - <td>SE</td> - - <td>homosu</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> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>US</td> <td></td> @@ -698,15 +681,15 @@ <tr> - <td>LT</td> + <td>NL</td> - <td></td> + <td>Amorphis</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -715,6 +698,23 @@ <tr> + <td>SE</td> + + <td>homosu</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> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>DE</td> <td></td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-07-28 01:06:05 UTC (rev 25728) +++ website/trunk/update-mirrors.pl 2012-07-28 19:28:09 UTC (rev 25729) @@ -1002,9 +1002,9 @@ mirror068 => { adminContact => "", orgName => "", - isoCC => "US", + isoCC => "FR", subRegion => "", - region => "US", + region => "FR", ipv4 => "True", ipv6 => "False", loadBalanced => "No",

1 0

r25728: {website} add mirror number 50, update the mirrors table. (in website/trunk: . include)
by Andrew Lewman 28 Jul '12

28 Jul '12

Author: phobos Date: 2012-07-28 01:06:05 +0000 (Sat, 28 Jul 2012) New Revision: 25728 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: add mirror number 50, update the mirrors table. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-07-27 02:28:45 UTC (rev 25727) +++ website/trunk/include/mirrors-table.wmi 2012-07-28 01:06:05 UTC (rev 25728) @@ -256,36 +256,36 @@ <tr> - <td>LT</td> + <td>DE</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> + <td><a href="http://torproject.cryptowars.info/dist/">http</a></td> + <td><a href="http://torproject.cryptowars.info/">http</a></td> + <td><a href="https://torproject.cryptowars.info/dist/">https</a></td> + <td><a href="https://torproject.cryptowars.info/">https</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> + <td><a href="rsync://torproject.cryptowars.info/">rsync</a></td> </tr> <tr> - <td>DE</td> + <td>US</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.cryptowars.info/dist/">http</a></td> - <td><a href="http://torproject.cryptowars.info/">http</a></td> - <td><a href="https://torproject.cryptowars.info/dist/">https</a></td> - <td><a href="https://torproject.cryptowars.info/">https</a></td> + <td><a href="http://tor.hardkor.info/dist/">http</a></td> + <td><a href="http://tor.hardkor.info/">http</a></td> <td> - </td> - <td><a href="rsync://torproject.cryptowars.info/">rsync</a></td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> @@ -698,6 +698,23 @@ <tr> + <td>LT</td> + + <td></td> + + <td>Out of date</td> + + <td> - </td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>DE</td> <td></td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-07-27 02:28:45 UTC (rev 25727) +++ website/trunk/update-mirrors.pl 2012-07-28 01:06:05 UTC (rev 25728) @@ -998,6 +998,24 @@ httpsDistMirror => "https://tor.mirrors.samwhited.com/dist/", rsyncDistMirror => "rsync://tor.mirrors.samwhited.com/dist", hiddenServiceMirror => "", + }, + mirror068 => { + adminContact => "", + orgName => "", + isoCC => "US", + subRegion => "", + region => "US", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://tor.hardkor.info/", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://tor.hardkor.info/dist/", + httpsDistMirror => "", + rsyncDistMirror => "", + hiddenServiceMirror => "", } );

1 0

[ooni-probe/master] Fix bug in script ending API
by art＠torproject.org 27 Jul '12

27 Jul '12

commit bedf7034ccdd42782c3bff44f1488d771d791a8d Author: Arturo Filastò <art(a)torproject.org> Date: Fri Jul 27 18:58:51 2012 +0200 Fix bug in script ending API --- ooni/ooniprobe.py | 3 ++- ooni/plugins/daphn3.py | 2 ++ ooni/plugoo/tests.py | 1 + 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ooni/ooniprobe.py b/ooni/ooniprobe.py index b75deca..5cde3b6 100755 --- a/ooni/ooniprobe.py +++ b/ooni/ooniprobe.py @@ -84,7 +84,8 @@ def runTest(test, options, global_options, reactor=reactor): test.runTool() return - if test.end: + if test.ended: + print "Ending prematurely" return wgen = work.WorkGenerator(test, diff --git a/ooni/plugins/daphn3.py b/ooni/plugins/daphn3.py index 6c1186e..bdba5d9 100644 --- a/ooni/plugins/daphn3.py +++ b/ooni/plugins/daphn3.py @@ -136,6 +136,8 @@ class daphn3Test(OONITest): #return endpoint.connect(Daphn3ClientFactory) def load_assets(self): + if not self.local_options: + return {} if not self.steps: print "Error: No assets!" self.end() diff --git a/ooni/plugoo/tests.py b/ooni/plugoo/tests.py index 482b8bc..1683ebc 100644 --- a/ooni/plugoo/tests.py +++ b/ooni/plugoo/tests.py @@ -26,6 +26,7 @@ class OONITest(object): blocking = False reactor = None tool = False + ended = False def __init__(self, local_options, global_options, report, ooninet=None, reactor=None):

1 0

[metrics-tasks/master] Update #6443 graphing code.
by karsten＠torproject.org 27 Jul '12

27 Jul '12

commit b1b7d5adae31f49ecabf3fb2c41c2e68819335a2 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jul 27 13:49:19 2012 +0200 Update #6443 graphing code. --- task-6443/cumulated-weights.R | 53 ++++++++++++++++++++++++++++++++++++++++- task-6443/run.sh | 2 +- 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/task-6443/cumulated-weights.R b/task-6443/cumulated-weights.R index 811564b..11458b4 100755 --- a/task-6443/cumulated-weights.R +++ b/task-6443/cumulated-weights.R @@ -19,8 +19,10 @@ v <- c( format((v[v <= week])[1], usetz = FALSE), format(now, usetz = FALSE)) v <- cw[cw$validafter %in% v, ] +v <- v[v$weight_type == "consensus weights", c(1, 3, 4)] v <- data.frame(x = v$top_relays, y = v$total_exit_probability, - colour = factor(v$validafter, levels = rev(levels(factor(v$validafter))))) + colour = factor(v$validafter, + levels = rev(levels(factor(v$validafter))))) ggplot(v, aes(x = x, y = y, colour = colour)) + geom_point() + geom_line() + @@ -69,3 +71,52 @@ opts(title = paste("Number of relays making up the top-x for a given", "total exit probability\n"), legend.position = "bottom") ggsave("exit-probability-cdf-c.png", width = 8, height = 5, dpi = 100) +v <- cw +max_validafter <- max(v$validafter) +v <- v[v$validafter == max_validafter, ] +ggplot(v, aes(x = top_relays, y = total_exit_probability, + colour = weight_type)) + +geom_point() + +geom_line() + +scale_x_continuous(name = "\nTop-x relays by exit probability") + +scale_y_continuous(name = "Total exit probability\n", labels = percent) + +scale_colour_hue(name = "") + +opts(title = paste("Probability of selecting one of the top-x relays\nfor", + "the exit position on", strftime(max_validafter, format = "%B %d, %Y")), + legend.position = "top") +ggsave("exit-probability-cdf-d.png", width = 8, height = 5, dpi = 100) + +c <- cw +c <- c[c$top_relays == 10, ] +c <- aggregate(list(total_exit_probability = c$total_exit_probability), + by = list(date = as.Date(cut.Date(as.Date(c$validafter, + origin = "1970-01-01 00:00:00"), "week")), + weight_type = c$weight_type), FUN = mean) +ggplot(c, aes(x = date, y = total_exit_probability, + colour = as.factor(weight_type))) + +geom_line() + +scale_x_date(name = "") + +scale_y_continuous(name = "Total exit probability of top-10 relays\n", + #limits = c(0, 1), labels = percent) + + labels = percent) + +scale_colour_hue(name = "") + +opts(title = paste("Probability of selecting one of the top-10 relays for", + "the exit position"), legend.position = "top") +ggsave("exit-probability-cdf-e.png", width = 8, height = 5, dpi = 100) + +i <- iw +i <- i[i$total_exit_probability == factor(0.5), ] +i <- aggregate(list(top_relays = i$top_relays), + by = list(date = as.Date(cut.Date(as.Date(i$validafter, + origin = "1970-01-01 00:00:00"), "week")), + weight_type = i$weight_type), FUN = mean) +ggplot(i, aes(x = date, y = top_relays, + colour = weight_type)) + +geom_line() + +scale_x_date(name = "") + +scale_y_continuous(name = "Top-x relays by exit probability\n") + +scale_colour_hue(name = "") + +opts(title = paste("Number of relays making up the top-x for 50%", + "total exit probability"), legend.position = "top") +ggsave("exit-probability-cdf-f.png", width = 8, height = 5, dpi = 100) + diff --git a/task-6443/run.sh b/task-6443/run.sh index 8ea016e..7a88306 100755 --- a/task-6443/run.sh +++ b/task-6443/run.sh @@ -1,3 +1,3 @@ #!/bin/bash -javac -d bin -cp lib/descriptor.jar src/CalculatePathSelectionProbabilities.java && java -cp bin:lib/descriptor.jar:lib/commons-codec-1.6.jar:lib/commons-compress-1.4.1.jar CalculatePathSelectionProbabilities +javac -d bin -cp lib/descriptor.jar src/CalculatePathSelectionProbabilities.java && java -Xmx2g -cp bin:lib/descriptor.jar:lib/commons-codec-1.6.jar:lib/commons-compress-1.4.1.jar CalculatePathSelectionProbabilities

1 0