tor-commits September 2011

tor-commits@lists.torproject.org

19 participants
865 discussions

r25002: {website} add separators for the new osx tbbs (website/trunk/projects/en)
by Erinn Clark 01 Sep '11

01 Sep '11

Author: erinn Date: 2011-09-01 02:50:34 +0000 (Thu, 01 Sep 2011) New Revision: 25002 Modified: website/trunk/projects/en/torbrowser.wml Log: add separators for the new osx tbbs Modified: website/trunk/projects/en/torbrowser.wml =================================================================== --- website/trunk/projects/en/torbrowser.wml 2011-09-01 02:34:55 UTC (rev 25001) +++ website/trunk/projects/en/torbrowser.wml 2011-09-01 02:50:34 UTC (rev 25002) @@ -97,75 +97,72 @@ <version-torbrowserbundleosx>, 28 MB)</p> -<li>English (en-US): <a -href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz">32-bit</a> (<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz.asc" style="font-size: 90%;">sig</a>) | <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-en-US.tar.gz">64-bit</a> (<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-en-US.tar.gz.asc" style="font-size: 90%;">sig</a>)</li> - <ul> <li>English (en-US): <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">32-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc" style="font-size: 90%;">signature</a>) + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc" style="font-size: 90%;">signature</a>) | <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-en-US.zip">64-bit</a> (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-en-US.zip.asc" style="font-size: 90%;">signature</a>)</li> <li>العربية (ar):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar.zip">32-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar.zip.asc" style="font-size: 90%;">signature</a>) <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-ar.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar.zip.asc" style="font-size: 90%;">signature</a>) | <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-ar.zip">64-bit</a> (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-ar.zip.asc" style="font-size: 90%;">signature</a>)</li> <li>Deutsch (de):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-de.zip">32-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-de.zip.asc" style="font-size: 90%;">signature</a>) + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-de.zip.asc" style="font-size: 90%;">signature</a>) | <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-de.zip">64-bit</a> (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-de.zip.asc" style="font-size: 90%;">signature</a>)</li> <li>Español (es-ES):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-es-ES.zip">32-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-es-ES.zip.asc" style="font-size: 90%;">signature</a>) + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-es-ES.zip.asc" style="font-size: 90%;">signature</a>) | <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-es-ES.zip">64-bit</a> (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-es-ES.zip.asc" style="font-size: 90%;">signature</a>) </li> <li>فارسی (fa):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fa.zip">32-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fa.zip.asc" style="font-size: 90%;">signature</a>) + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fa.zip.asc" style="font-size: 90%;">signature</a>) | <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-fa.zip">64-bit</a> (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-fa.zip.asc" style="font-size: 90%;">signature</a>) </li> <li>Français (fr):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fr.zip">32-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fr.zip.asc" style="font-size: 90%;">signature</a>) + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fr.zip.asc" style="font-size: 90%;">signature</a>) | <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-fr.zip">64-bit</a> (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-fr.zip.asc" style="font-size: 90%;">signature</a>) </li> <li>Italiano (it):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-it.zip">32-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-it.zip.asc" style="font-size: 90%;">signature</a>) + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-it.zip.asc" style="font-size: 90%;">signature</a>) | <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-it.zip">64-bit</a> (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-it.zip.asc" style="font-size: 90%;">signature</a>) </li> <li>Nederlands (nl):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-nl.zip">32-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-nl.zip.asc" style="font-size: 90%;">signature</a>) + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-nl.zip.asc" style="font-size: 90%;">signature</a>) | <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-nl.zip">64-bit</a> (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-nl.zip.asc" style="font-size: 90%;">signature</a>) </li> <li>Polish (pl):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pl.zip">32-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pl.zip.asc" style="font-size: 90%;">signature</a>) + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pl.zip.asc" style="font-size: 90%;">signature</a>) | <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-pl.zip">64-bit</a> (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-pl.zip.asc" style="font-size: 90%;">signature</a>) </li> <li>Português (pt-PT):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pt-PT.zip">32-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pt-PT.zip.asc" style="font-size: 90%;">signature</a>) + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pt-PT.zip.asc" style="font-size: 90%;">signature</a>) | <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-pt-PT.zip">64-bit</a> (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-pt-PT.zip.asc" style="font-size: 90%;">signature</a>) </li> <li>Русский (ru):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ru.zip">32-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ru.zip.asc" style="font-size: 90%;">signature</a>) + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ru.zip.asc" style="font-size: 90%;">signature</a>) | <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-ru.zip">64-bit</a> (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-ru.zip.asc" style="font-size: 90%;">signature</a>) </li> <li>简体字 (zh-CN):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-zh-CN.zip">32-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-zh-CN.zip.asc" style="font-size: 90%;">signature</a>) + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-zh-CN.zip.asc" style="font-size: 90%;">signature</a>) | <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-zh-CN.zip">64-bit</a> (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-zh-CN.zip.asc" style="font-size: 90%;">signature</a>) </li>

1 0

r25001: {website} update all versions of tor browser bundle to the 2.2.x serie (in website/trunk: download/en include projects/en)
by Erinn Clark 01 Sep '11

01 Sep '11

Author: erinn Date: 2011-09-01 02:34:55 +0000 (Thu, 01 Sep 2011) New Revision: 25001 Modified: website/trunk/download/en/download.wml website/trunk/include/versions.wmi website/trunk/projects/en/torbrowser.wml Log: update all versions of tor browser bundle to the 2.2.x series with firefox 6. update the torbrowser page to reflect this too. Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-08-31 19:06:55 UTC (rev 25000) +++ website/trunk/download/en/download.wml 2011-09-01 02:34:55 UTC (rev 25001) @@ -121,13 +121,20 @@  <div class="package" style="padding-top: 13px; border-top: 0px;"> <form class="downloads"> - <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal">Tor Browser Bundle (Beta)</span></a> + <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal">Tor Browser Bundle (32-bit Beta)</span></a> <select name="language" id="osx-tbb" class="lang"> #include <lang.wmi> </select> <div class="sig"> (<a class="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> + <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal">Tor Browser Bundle (64-bit Beta)</span></a> + <select name="language" id="osx-tbb" class="lang"> +#include <lang.wmi> + </select> + <div class="sig"> + (<a class="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + </div> <a href="<page projects/torbrowser-details>#build">Source Code</a> </form> Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-08-31 19:06:55 UTC (rev 25000) +++ website/trunk/include/versions.wmi 2011-09-01 02:34:55 UTC (rev 25001) @@ -23,34 +23,30 @@ <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.28</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.32-2</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-tor-components whitespace=delete>libevent-2.0.14-stable, zlib-1.2.5, openssl-1.0.0d</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>6.0.1</define-tag> +<define-tag version-torbrowser-torbutton whitespace=delete>1.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.14</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</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-torbrowserbundlelinux32 whitespace=delete>2.2.32-2</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.32-2</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-tor-components whitespace=delete>libevent-2.0.14, zlib-1.2.5, openssl-0.9.8p</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>6.0.1</define-tag> +<define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.1</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.14</define-tag> -<define-tag version-torbrowserbundleosx whitespace=delete>1.0.24</define-tag> +<define-tag version-torbrowserbundleosx whitespace=delete>2.2.32-2</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-firefox whitespace=delete>6.0.1</define-tag> +<define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.1</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.14</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> <define-tag version-androidbundle-tor whitespace=delete>0.2.2.25-alpha</define-tag> Modified: website/trunk/projects/en/torbrowser.wml =================================================================== --- website/trunk/projects/en/torbrowser.wml 2011-08-31 19:06:55 UTC (rev 25000) +++ website/trunk/projects/en/torbrowser.wml 2011-09-01 02:34:55 UTC (rev 25001) @@ -95,50 +95,82 @@ <p id="Download-torbrowserbundleosx" style="font-size: 120%; margin: 5mm">BETA: Tor Browser Bundle for Intel Mac OS X 10.5 and higher with Firefox (version <version-torbrowserbundleosx>, 28 MB)</p> + + +<li>English (en-US): <a +href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz">32-bit</a> (<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz.asc" style="font-size: 90%;">sig</a>) | <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-en-US.tar.gz">64-bit</a> (<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-en-US.tar.gz.asc" style="font-size: 90%;">sig</a>)</li> <ul> - <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">English (en-US)</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc" style="font-size: 90%;">signature</a>)</li> - - <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar.zip">العربية -(ar)</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar.zip.asc" style="font-size: 90%;">signature</a>)</li> + <li>English (en-US): <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc" style="font-size: 90%;">signature</a>) + <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-en-US.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-en-US.zip.asc" style="font-size: 90%;">signature</a>)</li> - <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-de.zip">Deutsch (de)</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-de.zip.asc" style="font-size: 90%;">signature</a>)</li> + <li>العربية (ar):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar.zip.asc" style="font-size: 90%;">signature</a>) <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-ar.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-ar.zip.asc" style="font-size: 90%;">signature</a>)</li> - <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-es-ES.zip">Español -(es-ES)</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-es-ES.zip.asc" style="font-size: 90%;">signature</a>)</li> + <li>Deutsch (de):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-de.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-de.zip.asc" style="font-size: 90%;">signature</a>) +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-de.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-de.zip.asc" style="font-size: 90%;">signature</a>)</li> - <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fa.zip">فارسی (fa) </a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fa.zip.asc" style="font-size: 90%;">signature</a>)</li> + <li>Español (es-ES):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-es-ES.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-es-ES.zip.asc" style="font-size: 90%;">signature</a>) +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-es-ES.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-es-ES.zip.asc" style="font-size: 90%;">signature</a>) +</li> - <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fr.zip">Français (fr)</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fr.zip.asc" style="font-size: 90%;">signature</a>)</li> + <li>فارسی (fa):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fa.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fa.zip.asc" style="font-size: 90%;">signature</a>) +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-fa.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-fa.zip.asc" style="font-size: 90%;">signature</a>) +</li> - <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-it.zip">Italiano (it)</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-it.zip.asc" style="font-size: 90%;">signature</a>)</li> + <li>Français (fr):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fr.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fr.zip.asc" style="font-size: 90%;">signature</a>) +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-fr.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-fr.zip.asc" style="font-size: 90%;">signature</a>) +</li> - <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-nl.zip">Nederlands (nl)</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-nl.zip.asc" style="font-size: 90%;">signature</a>)</li> + <li>Italiano (it):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-it.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-it.zip.asc" style="font-size: 90%;">signature</a>) +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-it.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-it.zip.asc" style="font-size: 90%;">signature</a>) + +</li> + + <li>Nederlands (nl):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-nl.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-nl.zip.asc" style="font-size: 90%;">signature</a>) +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-nl.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-nl.zip.asc" style="font-size: 90%;">signature</a>) +</li> - <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pl.zip">Polish (pl)</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pl.zip.asc" style="font-size: 90%;">signature</a>)</li> + <li>Polish (pl):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pl.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pl.zip.asc" style="font-size: 90%;">signature</a>) +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-pl.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-pl.zip.asc" style="font-size: 90%;">signature</a>) +</li> - <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pt-PT.zip">Português (pt-PT)</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pt-PT.zip.asc" style="font-size: 90%;">signature</a>)</li> + <li>Português (pt-PT):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pt-PT.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pt-PT.zip.asc" style="font-size: 90%;">signature</a>) +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-pt-PT.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-pt-PT.zip.asc" style="font-size: 90%;">signature</a>) +</li> - <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ru.zip">Русский -(ru)</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ru.zip.asc" style="font-size: 90%;">signature</a>)</li> + <li>Русский (ru):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ru.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ru.zip.asc" style="font-size: 90%;">signature</a>) +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-ru.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-ru.zip.asc" style="font-size: 90%;">signature</a>) +</li> - <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-zh-CN.zip">简体字 (zh-CN)</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-zh-CN.zip.asc" style="font-size: 90%;">signature</a>)</li> + <li>简体字 (zh-CN):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-zh-CN.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-zh-CN.zip.asc" style="font-size: 90%;">signature</a>) +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-zh-CN.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-zh-CN.zip.asc" style="font-size: 90%;">signature</a>) +</li> </ul> - - <p id="Download-torbrowserbundlelinux" style="font-size: 120%; margin: 5mm">BETA: Tor Browser Bundle for Linux with Firefox (version <version-torbrowserbundlelinux32> (32-bit), <version-torbrowserbundlelinux64> (64-bit), 24 MB)</p> @@ -285,11 +317,11 @@ website</a>.</p> <p><strong>What is in the Tor Browser Bundle?</strong> It - contains Tor, Vidalia, Polipo, Firefox, and Torbutton (<a + contains Tor, Vidalia, Firefox, and Torbutton (<a href="<page projects/torbrowser-details>#contents">learn more</a>).</p> <p><strong>What is in the Tor IM Browser Bundle?</strong> It - contains Tor, Vidalia, Polipo, Firefox, Torbutton, Pidgin and OTR (<a + contains Tor, Vidalia, Firefox, Torbutton, Pidgin and OTR (<a href="<page projects/torbrowser-details>#contents">learn more</a>).</p> <p><strong>How can I make my own bundle?</strong> To download

1 0

[tor/master] Make a version of tor_read_all_handle() for non-Windows platforms
by nickm＠torproject.org 01 Sep '11

01 Sep '11

commit 5b8a20ed447f11cda2e0bf528dd78e41e4b76fa4 Author: Steven Murdoch <Steven.Murdoch(a)cl.cam.ac.uk> Date: Thu Sep 1 01:06:12 2011 +0100 Make a version of tor_read_all_handle() for non-Windows platforms Mainly used for testing reading from subprocesses. To be more generic we now pass in a pointer to a process_handle_t rather than a Windows- specific HANDLE. --- src/common/util.c | 72 +++++++++++++++++++++++++++++++++++++++++-------- src/common/util.h | 13 +++++--- src/test/test_util.c | 43 ++++++++++++++++++------------ 3 files changed, 94 insertions(+), 34 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 09eb969..30c298e 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3522,7 +3522,8 @@ tor_get_exit_code(const process_handle_t process_handle, * only once the process has exited, or <b>count</b> bytes are read. Returns * the number of bytes read, or -1 on error. */ ssize_t -tor_read_all_handle(HANDLE h, char *buf, size_t count, HANDLE hProcess) +tor_read_all_handle(HANDLE h, char *buf, size_t count, + const process_handle_t *process) { size_t numread = 0; BOOL retval; @@ -3544,7 +3545,7 @@ tor_read_all_handle(HANDLE h, char *buf, size_t count, HANDLE hProcess) /* Nothing available: process exited or it is busy */ /* Exit if we don't know whether the process is running */ - if (NULL == hProcess) + if (NULL == process) break; /* The process exited and there's nothing left to read from it */ @@ -3554,7 +3555,8 @@ tor_read_all_handle(HANDLE h, char *buf, size_t count, HANDLE hProcess) /* If process is not running, check for output one more time in case it wrote something after the peek was performed. Otherwise keep on waiting for output */ - byte_count = WaitForSingleObject(hProcess, 0); + tor_assert(process != NULL); + byte_count = WaitForSingleObject(process->pid.hProcess, 0); if (WAIT_TIMEOUT != byte_count) process_exited = TRUE; @@ -3576,31 +3578,77 @@ tor_read_all_handle(HANDLE h, char *buf, size_t count, HANDLE hProcess) } return (ssize_t)numread; } +#else +/** Read from a handle <b>h</b> into <b>buf</b>, up to <b>count</b> bytes. If + * <b>process</b> is NULL, the function will return immediately if there is + * nothing more to read. Otherwise data will be read until end of file, or + * <b>count</b> bytes are read. Returns the number of bytes read, or -1 on + * error. */ +ssize_t +tor_read_all_handle(FILE *h, char *buf, size_t count, + const process_handle_t *process) +{ + size_t numread = 0; + char *retval; + + if (count > SIZE_T_CEILING || count > SSIZE_T_MAX) + return -1; + + while (numread != count) { + /* Use fgets because that is what we use in log_from_pipe() */ + retval = fgets(buf+numread, (int)(count-numread), h); + if (NULL == retval) { + if (feof(h)) { + fclose(h); + break; + } else { + if (EAGAIN == errno) { + if (process) + continue; + else + break; + } else { + log_warn(LD_GENERAL, "fgets() from handle failed: %s", + strerror(errno)); + fclose(h); + return -1; + } + } + } + tor_assert(retval != NULL); + numread += strlen(retval); + } + + log_debug(LD_GENERAL, "fgets read %d bytes from handle", (int)numread); + return (ssize_t)numread; +} #endif /** Read from stdout of a process until the process exits. */ ssize_t -tor_read_all_from_process_stdout(const process_handle_t process_handle, - char *buf, size_t count) +tor_read_all_from_process_stdout(const process_handle_t *process_handle, + char *buf, size_t count) { #ifdef MS_WINDOWS - return tor_read_all_handle(process_handle.stdout_pipe, buf, count, - process_handle.pid.hProcess); + return tor_read_all_handle(process_handle->stdout_pipe, buf, count, + process_handle); #else - return read_all(process_handle.stdout_pipe, buf, count, 0); + return tor_read_all_handle(process_handle->stdout_handle, buf, count, + process_handle); #endif } /** Read from stdout of a process until the process exits. */ ssize_t -tor_read_all_from_process_stderr(const process_handle_t process_handle, +tor_read_all_from_process_stderr(const process_handle_t *process_handle, char *buf, size_t count) { #ifdef MS_WINDOWS - return tor_read_all_handle(process_handle.stderr_pipe, buf, count, - process_handle.pid.hProcess); + return tor_read_all_handle(process_handle->stderr_pipe, buf, count, + process_handle); #else - return read_all(process_handle.stderr_pipe, buf, count, 0); + return tor_read_all_handle(process_handle->stderr_handle, buf, count, + process_handle); #endif } diff --git a/src/common/util.h b/src/common/util.h index 3029425..6211267 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -388,12 +388,15 @@ int tor_get_exit_code(const process_handle_t process_handle, int tor_split_lines(struct smartlist_t *sl, char *buf, int len); #ifdef MS_WINDOWS ssize_t tor_read_all_handle(HANDLE h, char *buf, size_t count, - HANDLE hProcess); + const process_handle_t *process); +#else +ssize_t tor_read_all_handle(FILE *h, char *buf, size_t count, + const process_handle_t *process); #endif -ssize_t tor_read_all_from_process_stdout(const process_handle_t process_handle, - char *buf, size_t count); -ssize_t tor_read_all_from_process_stderr(const process_handle_t process_handle, - char *buf, size_t count); +ssize_t tor_read_all_from_process_stdout( + const process_handle_t *process_handle, char *buf, size_t count); +ssize_t tor_read_all_from_process_stderr( + const process_handle_t *process_handle, char *buf, size_t count); char *tor_join_win_cmdline(const char *argv[]); void format_helper_exit_status(unsigned char child_state, int saved_errno, char *hex_errno); diff --git a/src/test/test_util.c b/src/test/test_util.c index b903cbf..336f95b 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1404,8 +1404,8 @@ run_util_spawn_background(const char *argv[], const char *expected_out, tt_int_op(process_handle.stderr_pipe, >, 0); /* Check stdout */ - pos = tor_read_all_from_process_stdout(process_handle, stdout_buf, - sizeof(stdout_buf) - 1); + pos = tor_read_all_from_process_stdout(&process_handle, stdout_buf, + sizeof(stdout_buf) - 1); tt_assert(pos >= 0); stdout_buf[pos] = '\0'; tt_str_op(stdout_buf, ==, expected_out); @@ -1418,7 +1418,7 @@ run_util_spawn_background(const char *argv[], const char *expected_out, // TODO: Make test-child exit with something other than 0 /* Check stderr */ - pos = tor_read_all_from_process_stderr(process_handle, stderr_buf, + pos = tor_read_all_from_process_stderr(&process_handle, stderr_buf, sizeof(stderr_buf) - 1); tt_assert(pos >= 0); stderr_buf[pos] = '\0'; @@ -1493,57 +1493,66 @@ test_util_spawn_background_partial_read(void *ptr) "DONE\r\n", NULL }; const char *expected_err = "ERR\r\n"; - int expected_out_ctr; #else const char *argv[] = {BUILDDIR "/src/test/test-child", "--test", NULL}; - const char *expected_out = "OUT\n--test\nSLEEPING\nDONE\n"; - const char *expected_err = "ERR\r\n"; + const char *expected_out[] = { "OUT\n--test\nSLEEPING\n", + "DONE\n", + NULL }; + const char *expected_err = "ERR\n"; #endif + int expected_out_ctr; (void)ptr; /* Start the program */ +#ifdef MS_WINDOWS tor_spawn_background(NULL, argv, &process_handle); +#else + tor_spawn_background(argv[0], argv, &process_handle); +#endif tt_int_op(process_handle.status, ==, expected_status); /* Check stdout */ -#ifdef MS_WINDOWS for (expected_out_ctr =0; expected_out[expected_out_ctr] != NULL;) { +#ifdef MS_WINDOWS pos = tor_read_all_handle(process_handle.stdout_pipe, stdout_buf, sizeof(stdout_buf) - 1, NULL); +#else + pos = tor_read_all_handle(process_handle.stdout_handle, stdout_buf, + sizeof(stdout_buf) - 1, NULL); +#endif log_info(LD_GENERAL, "tor_read_all_handle() returned %d", (int)pos); /* We would have blocked, keep on trying */ if (0 == pos) continue; - tt_assert(pos >= 0); + tt_int_op(pos, >=, 0); stdout_buf[pos] = '\0'; tt_str_op(stdout_buf, ==, expected_out[expected_out_ctr]); tt_int_op(pos, ==, strlen(expected_out[expected_out_ctr])); expected_out_ctr++; } + /* The process should have exited without writing more */ +#ifdef MS_WINDOWS pos = tor_read_all_handle(process_handle.stdout_pipe, stdout_buf, sizeof(stdout_buf) - 1, - process_handle.pid.hProcess); - tt_int_op(pos, ==, 0); + &process_handle); #else - pos = tor_read_all_from_process_stdout(process_handle, stdout_buf, - sizeof(stdout_buf) - 1); - tt_assert(pos >= 0); - stdout_buf[pos] = '\0'; - tt_str_op(stdout_buf, ==, expected_out); - tt_int_op(pos, ==, strlen(expected_out)); + pos = tor_read_all_handle(process_handle.stdout_handle, stdout_buf, + sizeof(stdout_buf) - 1, + &process_handle); #endif /* Check it terminated correctly */ retval = tor_get_exit_code(process_handle, 1, &exit_code); tt_int_op(retval, ==, PROCESS_EXIT_EXITED); tt_int_op(exit_code, ==, expected_exit); + // TODO: Make test-child exit with something other than 0 /* Check stderr */ - pos = tor_read_all_from_process_stderr(process_handle, stderr_buf, + pos = tor_read_all_from_process_stderr(&process_handle, stderr_buf, sizeof(stderr_buf) - 1); tt_assert(pos >= 0); stderr_buf[pos] = '\0';

1 0

[tor/master] Tweaks on last process-launch patches
by nickm＠torproject.org 01 Sep '11

01 Sep '11

commit 6a3e4a89a24fc1e776b84f55ff884b88ef78ceb3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 31 22:14:38 2011 -0400 Tweaks on last process-launch patches --- src/common/util.c | 1 + src/test/test_util.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 30c298e..7cd9dd8 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3616,6 +3616,7 @@ tor_read_all_handle(FILE *h, char *buf, size_t count, } } tor_assert(retval != NULL); + tor_assert(strlen(retval) + numread <= count); numread += strlen(retval); } diff --git a/src/test/test_util.c b/src/test/test_util.c index 336f95b..06c1be3 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1647,8 +1647,7 @@ test_util_split_lines(void *ptr) for (i=0; tests[i].orig_line; i++) { sl = smartlist_create(); /* Allocate space for string and trailing NULL */ - orig_line = tor_malloc(tests[i].orig_length + 1); - memcpy(orig_line, tests[i].orig_line, tests[i].orig_length + 1); + orig_line = tor_memdup(tests[i].orig_line, tests[i].orig_length + 1); tor_split_lines(sl, orig_line, tests[i].orig_length); j = 0;

1 0

[tor/master] Fix off-by-one error when allocating memory in test_util_split_lines()
by nickm＠torproject.org 01 Sep '11

01 Sep '11

commit 76fde28475a5b977d1fa94d06c116ec39a386ac8 Author: Steven Murdoch <Steven.Murdoch(a)cl.cam.ac.uk> Date: Wed Aug 31 23:40:29 2011 +0100 Fix off-by-one error when allocating memory in test_util_split_lines() Triggered "failed OVER picket-fence magic-number check (err 27)" when memory debugging using dmalloc is enabled (at 'low' or higher). --- src/test/test_util.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 3b5d85f..b903cbf 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1637,7 +1637,8 @@ test_util_split_lines(void *ptr) for (i=0; tests[i].orig_line; i++) { sl = smartlist_create(); - orig_line = tor_malloc(tests[i].orig_length); + /* Allocate space for string and trailing NULL */ + orig_line = tor_malloc(tests[i].orig_length + 1); memcpy(orig_line, tests[i].orig_line, tests[i].orig_length + 1); tor_split_lines(sl, orig_line, tests[i].orig_length);

1 0

[torflow/master] fix atexit handler to call connection.close()
by mikeperry＠torproject.org 01 Sep '11

01 Sep '11

commit 897d7c3c7cc252da7bce4a71c2a277edd2ef9ba9 Author: aagbsn <aagbsn(a)extc.org> Date: Tue Aug 23 14:34:26 2011 -0700 fix atexit handler to call connection.close() the _eventLoop thread raised an exception before bwauthority_child exited; the new behavior is to call connection.close() in the atexit handler. --- NetworkScanners/BwAuthority/bwauthority_child.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NetworkScanners/BwAuthority/bwauthority_child.py b/NetworkScanners/BwAuthority/bwauthority_child.py index f842843..74ec257 100755 --- a/NetworkScanners/BwAuthority/bwauthority_child.py +++ b/NetworkScanners/BwAuthority/bwauthority_child.py @@ -338,7 +338,8 @@ def ignore_streams(c,hdlr): s.ignored = True hdlr.streams[s.strm_id] = s -def cleanup(): +def cleanup(c): + c.close() plog("DEBUG", "Child Process Exiting...") def setup_handler(out_dir, cookie_file): @@ -363,7 +364,7 @@ def setup_handler(out_dir, cookie_file): TorCtl.EVENT_TYPE.CIRC, TorCtl.EVENT_TYPE.STREAM_BW], True) - atexit.register(cleanup) + atexit.register(cleanup, c) return (c,h) def usage(argv):

1 0

[torflow/master] Update submodule..
by mikeperry＠torproject.org 01 Sep '11

01 Sep '11

commit 9e4b804a398ebf5bec1ffc261577a4b84b35f220 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Aug 31 18:19:16 2011 -0700 Update submodule.. --- TorCtl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/TorCtl b/TorCtl index 25cb2bf..a3ed3d0 160000 --- a/TorCtl +++ b/TorCtl @@ -1 +1 @@ -Subproject commit 25cb2bf77b1a98f2273b0f90c99b57e3d6e21a41 +Subproject commit a3ed3d01ff93df9d25dc64ffbacfcb6b4ef0befa

1 0

[torflow/master] log branch and head to bw.log
by mikeperry＠torproject.org 01 Sep '11

01 Sep '11

commit b063ba3a52bf197accf7bcb0743f264704629432 Author: aagbsn <aagbsn(a)extc.org> Date: Wed Aug 31 17:03:55 2011 -0700 log branch and head to bw.log --- NetworkScanners/BwAuthority/bwauthority.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/NetworkScanners/BwAuthority/bwauthority.py b/NetworkScanners/BwAuthority/bwauthority.py index 3e626db..4bab6c1 100755 --- a/NetworkScanners/BwAuthority/bwauthority.py +++ b/NetworkScanners/BwAuthority/bwauthority.py @@ -5,6 +5,7 @@ from sys import exit from subprocess import Popen path.append("../../") from TorCtl.TorUtil import plog as plog +from TorCtl.TorUtil import get_git_version as get_git_version from signal import signal, SIGTERM, SIGKILL @@ -12,7 +13,15 @@ from signal import signal, SIGTERM, SIGKILL # make sure to update this in bwauthority_child.py as well STOP_PCT_REACHED = 9 +# path to git repos (.git) +PATH_TO_TORFLOW_REPO = '../../.git/' +PATH_TO_TORCTL_REPO = '../../TorCtl/.git/' + def main(argv): + (branch, head) = get_git_version(PATH_TO_TORFLOW_REPO) + plog('INFO', 'TorFlow Version: %s' % branch+' '+head) + (branch, head) = get_git_version(PATH_TO_TORCTL_REPO) + plog('INFO', 'TorCtl Version: %s' % branch+' '+head) slice_num = 0 while True: plog('INFO', 'Beginning time loop')

1 0

[torflow/master] wait for connection to close before exiting
by mikeperry＠torproject.org 01 Sep '11

01 Sep '11

commit 09f232bffa3cf51db21c53c81e544ad977bcb335 Author: aagbsn <aagbsn(a)extc.org> Date: Wed Aug 24 17:04:22 2011 -0700 wait for connection to close before exiting TorCtl.Connection.close() doesn't block; use TorCtl.Connection.block_until_close() to join the _eventLoop thread --- NetworkScanners/BwAuthority/bwauthority_child.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/NetworkScanners/BwAuthority/bwauthority_child.py b/NetworkScanners/BwAuthority/bwauthority_child.py index 4aa7607..3aa13b2 100755 --- a/NetworkScanners/BwAuthority/bwauthority_child.py +++ b/NetworkScanners/BwAuthority/bwauthority_child.py @@ -339,7 +339,10 @@ def ignore_streams(c,hdlr): hdlr.streams[s.strm_id] = s def cleanup(c): - if c: c.close() + if c: + c.close() + c.block_until_close() + plog("DEBUG", "Child Process Exiting...") def setup_handler(out_dir, cookie_file):

1 0

[torflow/master] Disable microdescriptors
by mikeperry＠torproject.org 01 Sep '11

01 Sep '11

commit e0ac2612ca190172e5d6b063f6e308612653e29f Author: aagbsn <aagbsn(a)extc.org> Date: Wed Aug 24 16:45:50 2011 -0700 Disable microdescriptors microdescriptors are enabled by default since v0.2.3.2-alpha-dev TorCtl does not support microdescriptors --- NetworkScanners/BwAuthority/bwauthority_child.py | 2 +- NetworkScanners/BwAuthority/data/tor/torrc | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/NetworkScanners/BwAuthority/bwauthority_child.py b/NetworkScanners/BwAuthority/bwauthority_child.py index 74ec257..4aa7607 100755 --- a/NetworkScanners/BwAuthority/bwauthority_child.py +++ b/NetworkScanners/BwAuthority/bwauthority_child.py @@ -339,7 +339,7 @@ def ignore_streams(c,hdlr): hdlr.streams[s.strm_id] = s def cleanup(c): - c.close() + if c: c.close() plog("DEBUG", "Child Process Exiting...") def setup_handler(out_dir, cookie_file): diff --git a/NetworkScanners/BwAuthority/data/tor/torrc b/NetworkScanners/BwAuthority/data/tor/torrc index ee677ff..11b8368 100644 --- a/NetworkScanners/BwAuthority/data/tor/torrc +++ b/NetworkScanners/BwAuthority/data/tor/torrc @@ -8,3 +8,4 @@ PidFile ./data/tor/tor.pid CookieAuthentication 1 FetchUselessDescriptors 1 __LeaveStreamsUnattached 1 +UseMicrodescriptors 0

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2011