April 2014 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 29 Apr '14

29 Apr '14

commit 27438ef7c6a34b71165480f4d2c9173278e6d854 Merge: 545e211 35699ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 29 21:08:26 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' Doing an "ours" merge to avoid taking 35699ef9f5d2814203653e16c, which is a cherry-picked backport of 9686.

1 0

r26752: {website} and fix it in a fifth place (the language dropdown is javasc (website/trunk/include)
by Roger Dingledine 29 Apr '14

29 Apr '14

Author: arma Date: 2014-04-30 01:05:24 +0000 (Wed, 30 Apr 2014) New Revision: 26752 Modified: website/trunk/include/dlhead.wmi Log: and fix it in a fifth place (the language dropdown is javascript based) Modified: website/trunk/include/dlhead.wmi =================================================================== --- website/trunk/include/dlhead.wmi 2014-04-30 01:03:37 UTC (rev 26751) +++ website/trunk/include/dlhead.wmi 2014-04-30 01:05:24 UTC (rev 26752) @@ -61,8 +61,8 @@ var pkg = caller.attr('id'); var lang = caller.val(); var wintbb = '../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_'+lang+'.exe'; - var osxtbb = '../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_'+lang+'.zip'; - var osxtbb64 = '../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx64_'+lang+'.zip'; + var osxtbb = '../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_'+lang+'.dmg'; + var osxtbb64 = '../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx64_'+lang+'.dmg'; var lintbb32 = '../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_'+lang+'.tar.xz'; var lintbb64 = '../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_'+lang+'.tar.xz'; if(pkg == 'win-tbb'){

1 0

r26751: {website} and fix it in a fourth place (website/trunk/projects/en)
by Roger Dingledine 29 Apr '14

29 Apr '14

Author: arma Date: 2014-04-30 01:03:37 +0000 (Wed, 30 Apr 2014) New Revision: 26751 Modified: website/trunk/projects/en/torbrowser.wml Log: and fix it in a fourth place Modified: website/trunk/projects/en/torbrowser.wml =================================================================== --- website/trunk/projects/en/torbrowser.wml 2014-04-30 00:57:42 UTC (rev 26750) +++ website/trunk/projects/en/torbrowser.wml 2014-04-30 01:03:37 UTC (rev 26751) @@ -117,8 +117,8 @@ <td>العربية (ar)</td> <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_ar.exe">32-bit</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_ar.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_ar.zip">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_ar.zip.asc">sig</a>) + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_ar.dmg">32-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_ar.dmg.asc">sig</a>)  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_ar.tar.xz">32-bit</a> @@ -130,8 +130,8 @@ <td>Deutsch (de)</td> <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_de.exe">32-bit</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_de.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_de.zip">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_de.zip.asc">sig</a>) + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_de.dmg">32-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_de.dmg.asc">sig</a>)  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_de.tar.xz">32-bit</a> @@ -143,8 +143,8 @@ <td>Español (es-ES)</td> <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_es-ES.exe">32-bit</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_es-ES.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_es-ES.zip">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_es-ES.zip.asc">sig</a>) + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_es-ES.dmg">32-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_es-ES.dmg.asc">sig</a>)  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_es-ES.tar.xz">32-bit</a> @@ -156,8 +156,8 @@ <td>فارسی (fa)</td> <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_fa.exe">32-bit</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_fa.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_fa.zip">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_fa.zip.asc">sig</a>) + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_fa.dmg">32-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_fa.dmg.asc">sig</a>)  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_fa.tar.xz">32-bit</a> @@ -169,8 +169,8 @@ <td>Français (fr)</td> <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_fr.exe">32-bit</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_fr.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_fr.zip">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_fr.zip.asc">sig</a>) + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_fr.dmg">32-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_fr.dmg.asc">sig</a>)  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_fr.tar.xz">32-bit</a> @@ -182,8 +182,8 @@ <td>Italiano (it)</td> <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_it.exe">32-bit</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_it.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_it.zip">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_it.zip.asc">sig</a>) + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_it.dmg">32-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_it.dmg.asc">sig</a>)  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_it.tar.xz">32-bit</a> @@ -195,8 +195,8 @@ <td>Korean (ko)</td> <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_ko.exe">32-bit</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_ko.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_ko.zip">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_ko.zip.asc">sig</a>) + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_ko.dmg">32-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_ko.dmg.asc">sig</a>)  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_ko.tar.xz">32-bit</a> @@ -208,8 +208,8 @@ <td>Nederlands (nl)</td> <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_nl.exe">32-bit</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_nl.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_nl.zip">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_nl.zip.asc">sig</a>) + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_nl.dmg">32-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_nl.dmg.asc">sig</a>)  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_nl.tar.xz">32-bit</a> @@ -221,8 +221,8 @@ <td>Polish (pl)</td> <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_pl.exe">32-bit</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_pl.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_pl.zip">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_pl.zip.asc">sig</a>) + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_pl.dmg">32-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_pl.dmg.asc">sig</a>)  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_pl.tar.xz">32-bit</a> @@ -234,8 +234,8 @@ <td>Português (pt-PT)</td> <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_pt-PT.exe">32-bit</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_pt-PT.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_pt-PT.zip">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_pt-PT.zip.asc">sig</a>) + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_pt-PT.dmg">32-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_pt-PT.dmg.asc">sig</a>)  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_pt-PT.tar.xz">32-bit</a> @@ -247,8 +247,8 @@ <td>Русский (ru)</td> <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_ru.exe">32-bit</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_ru.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_ru.zip">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_ru.zip.asc">sig</a>) + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_ru.dmg">32-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_ru.dmg.asc">sig</a>)  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_ru.tar.xz">32-bit</a> @@ -260,8 +260,8 @@ <td>Vietnamese (vi)</td> <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_vi.exe">32-bit</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_vi.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_vi.zip">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_vi.zip.asc">sig</a>) + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_vi.dmg">32-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_vi.dmg.asc">sig</a>)  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_vi.tar.xz">32-bit</a> @@ -273,8 +273,8 @@ <td>简体字 (zh-CN)</td> <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_zh-CN.exe">32-bit</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_zh-CN.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_zh-CN.zip">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_zh-CN.zip.asc">sig</a>) + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_zh-CN.dmg">32-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_zh-CN.dmg.asc">sig</a>)  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_zh-CN.tar.xz">32-bit</a> @@ -513,7 +513,7 @@ Download the file above, save it somewhere, then click on it. Mac OS X will automatically unarchive it and you will have a TorBrowser application in your chosen language. (e.g. TorBrowser_en-US.app) - Click the TorBrowserBundle application to launch TorBrowser. + Click the TorBrowser application to launch Tor Browser. </div> <div class="pjimage"><img src="$(IMGROOT)/screenshot-osx-torbrowser-icon.png" alt="Screenshot Mac OS X bundle" width="414" height="315"></div> </div>

1 0

r26750: {website} fix a broken link (found by wget -m) (website/trunk/getinvolved/en)
by Roger Dingledine 29 Apr '14

29 Apr '14

Author: arma Date: 2014-04-30 00:57:42 +0000 (Wed, 30 Apr 2014) New Revision: 26750 Modified: website/trunk/getinvolved/en/volunteer.wml Log: fix a broken link (found by wget -m) Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2014-04-30 00:49:19 UTC (rev 26749) +++ website/trunk/getinvolved/en/volunteer.wml 2014-04-30 00:57:42 UTC (rev 26750) @@ -1756,7 +1756,7 @@ To address this, we would like to have <a -href=">https://trac.torproject.org/projects/tor/ticket/6119">our own +href="https://trac.torproject.org/projects/tor/ticket/6119">our own fingerprint test suite</a> to evaluate the fingerprintability of each browser feature for users running a specific Tor Browser version. There are also <a href="https://trac.torproject.org/projects/tor/query?keywords=~tbb-fingerprinting">additional

1 0

r26749: {website} try to make the 'beta' tbb table not full of 404's anymore (website/trunk/include)
by Roger Dingledine 29 Apr '14

29 Apr '14

Author: arma Date: 2014-04-30 00:49:19 +0000 (Wed, 30 Apr 2014) New Revision: 26749 Modified: website/trunk/include/versions.wmi Log: try to make the 'beta' tbb table not full of 404's anymore Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2014-04-30 00:46:50 UTC (rev 26748) +++ website/trunk/include/versions.wmi 2014-04-30 00:49:19 UTC (rev 26749) @@ -24,7 +24,7 @@ <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> <define-tag version-torbrowserbundledir whitespace=delete>3.6</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>3.6-beta-2</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>3.6</define-tag> <define-tag version-torbrowserbundle whitespace=delete>3.6</define-tag> <define-tag version-torbrowserbundlebeta whitespace=delete>3.6-beta-2</define-tag>

1 0

[tor/maint-0.2.4] Drop the MaxMemInCellQueues lower limit down to 256 MB.
by nickm＠torproject.org 29 Apr '14

29 Apr '14

commit 35699ef9f5d2814203653e16cb0cd176a0190ae0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 20 12:12:47 2013 -0500 Drop the MaxMemInCellQueues lower limit down to 256 MB. on #9686, gmorehose reports that the 500 MB lower limit is too high for raspberry pi users. This is a backport of 647248729fa65f0e51d062e2af8f4e8b38592bf5 to 0.2.4. Note that in 0.2.4, the option is called MaxMemInCellQueues. --- changes/bug9686_024 | 5 +++++ src/or/config.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/changes/bug9686_024 b/changes/bug9686_024 new file mode 100644 index 0000000..8705379 --- /dev/null +++ b/changes/bug9686_024 @@ -0,0 +1,5 @@ + o Minor features (security): + - Decrease the lower limit of MaxMemInCellQueues to 256 MBytes (but leave + the default at 8GBytes), to better support Raspberry Pi users. Fixes + bug 9686; bugfix on 0.2.4.14-alpha. + diff --git a/src/or/config.c b/src/or/config.c index ef02946..85a5e83 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2616,10 +2616,10 @@ options_validate(or_options_t *old_options, or_options_t *options, REJECT("If EntryNodes is set, UseEntryGuards must be enabled."); } - if (options->MaxMemInCellQueues < (500 << 20)) { - log_warn(LD_CONFIG, "MaxMemInCellQueues must be at least 500 MB for now. " + if (options->MaxMemInCellQueues < (256 << 20)) { + log_warn(LD_CONFIG, "MaxMemInCellQueues must be at least 256 MB for now. " "Ideally, have it as large as you can afford."); - options->MaxMemInCellQueues = (500 << 20); + options->MaxMemInCellQueues = (256 << 20); } options->AllowInvalid_ = 0;

1 0

r26748: {website} same file name fix in the third place (website/trunk/projects/en)
by Roger Dingledine 29 Apr '14

29 Apr '14

Author: arma Date: 2014-04-30 00:46:50 +0000 (Wed, 30 Apr 2014) New Revision: 26748 Modified: website/trunk/projects/en/torbrowser.wml Log: same file name fix in the third place Modified: website/trunk/projects/en/torbrowser.wml =================================================================== --- website/trunk/projects/en/torbrowser.wml 2014-04-30 00:30:41 UTC (rev 26747) +++ website/trunk/projects/en/torbrowser.wml 2014-04-30 00:46:50 UTC (rev 26748) @@ -104,8 +104,8 @@ <td>English (en-US)</td> <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_en-US.exe">32-bit</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_en-US.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_en-US.zip">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_en-US.zip.asc">sig</a>) + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_en-US.dmg">32-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_en-US.dmg.asc">sig</a>)  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.xz">32-bit</a>

1 0

r26747: {website} fix the filename for the new osx tbb's (website/trunk/download/en)
by Roger Dingledine 29 Apr '14

29 Apr '14

Author: arma Date: 2014-04-30 00:30:41 +0000 (Wed, 30 Apr 2014) New Revision: 26747 Modified: website/trunk/download/en/download-easy.wml website/trunk/download/en/download.wml Log: fix the filename for the new osx tbb's Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2014-04-30 00:18:43 UTC (rev 26746) +++ website/trunk/download/en/download-easy.wml 2014-04-30 00:30:41 UTC (rev 26747) @@ -64,13 +64,13 @@ Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a> </div> <form class="downloads"> - <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_<lang>.zip">Download<button-osx-tbb32></a> + <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_<lang>.dmg">Download<button-osx-tbb32></a> <select name="language" id="osx-tbb" class="lang"> #include <lang.wmi> </select> <div class="sig" style="margin-bottom: 5px;"> <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a> - (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_<lang>.dmg.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a> Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2014-04-30 00:18:43 UTC (rev 26746) +++ website/trunk/download/en/download.wml 2014-04-30 00:30:41 UTC (rev 26747) @@ -124,13 +124,13 @@ # <div class="package" style="padding-top: 13px; border-top: 0px;"> <form class="downloads"> - <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_<lang>.zip">Download<button-osx-tbb32></a> + <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_<lang>.dmg">Download<button-osx-tbb32></a> <select name="language" id="osx-tbb" class="lang"> #include <lang.wmi> </select> <div class="sig"> <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a> - (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_<lang>.dmg.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> <a class="additional" href="<page projects/torbrowser>#downloads-beta">Download Unstable</a> # Comment out until 64-bit OSX bundles are available again

1 0

[torbrowser/master] Revert "Unrecommend 3.5.4 and 3.6-beta-2."
by mikeperry＠torproject.org 29 Apr '14

29 Apr '14

commit be58e3dfb596d30bab6508997a5276218172b571 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 30 02:27:36 2014 +0200 Revert "Unrecommend 3.5.4 and 3.6-beta-2." This reverts commit d9333f2bf65806c06c75be7bfa6e2f30b69eb375. --- build-scripts/recommended-versions | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index b770f95..9cc5b36 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,4 +1,10 @@ [ +"3.5.4-Linux", +"3.5.4-MacOS", +"3.5.4-Windows", +"3.6-beta-2-Linux", +"3.6-beta-2-MacOS", +"3.6-beta-2-Windows", "3.6-Linux", "3.6-MacOS", "3.6-Windows"

1 0

r26746: {website} Send PT users to the main download page. (website/trunk/docs/en)
by Mike Perry 29 Apr '14

29 Apr '14

Author: mikeperry Date: 2014-04-30 00:18:43 +0000 (Wed, 30 Apr 2014) New Revision: 26746 Modified: website/trunk/docs/en/pluggable-transports.wml Log: Send PT users to the main download page. Modified: website/trunk/docs/en/pluggable-transports.wml =================================================================== --- website/trunk/docs/en/pluggable-transports.wml 2014-04-29 23:23:00 UTC (rev 26745) +++ website/trunk/docs/en/pluggable-transports.wml 2014-04-30 00:18:43 UTC (rev 26746) @@ -125,11 +125,10 @@ <hr> <a id="download"></a> - <h2><a href="<page projects/torbrowser>#downloads-beta">Download the Pluggable Transports Tor Browser Bundle</a></h2> + <h2><a href="<page download/download-easy>">Download the Pluggable Transports Tor Browser Bundle</a></h2> As of Tor Browser 3.6-beta-1, pluggable transports are now included in the -<a -href="<page projects/torbrowser>#downloads-beta">official +<a href="<page download/download-easy>">official Tor Browser packages</a>.

1 0