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

r26766: {website} Bump version for TBB 3.6.1 (website/trunk/include)
by Mike Perry 07 May '14

07 May '14

Author: mikeperry Date: 2014-05-07 14:12:31 +0000 (Wed, 07 May 2014) New Revision: 26766 Modified: website/trunk/include/versions.wmi Log: Bump version for TBB 3.6.1 Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2014-05-07 07:32:53 UTC (rev 26765) +++ website/trunk/include/versions.wmi 2014-05-07 14:12:31 UTC (rev 26766) @@ -23,10 +23,10 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> <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</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>3.6.1</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>3.6.1</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>3.6</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>3.6.1</define-tag> <define-tag version-torbrowserbundlebeta whitespace=delete>3.6-beta-2</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag> @@ -37,8 +37,8 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>3.6</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>3.6</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>3.6.1</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>3.6.1</define-tag> <define-tag version-torbrowserbundlelinux32beta whitespace=delete>3.6-beta-2</define-tag> <define-tag version-torbrowserbundlelinux64beta whitespace=delete>3.6-beta-2</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> @@ -47,7 +47,7 @@ <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>3.6</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>3.6.1</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-15</define-tag> <define-tag version-torbrowserbundleosx32beta whitespace=delete>3.6-beta-2</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag>

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 07 May '14

07 May '14

commit b320f66ce5f9db8292b9c8dd0bfec95b0615c6ec Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 7 13:45:12 2014 +0000 Update translations for torcheck_completed --- es/torcheck.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/es/torcheck.po b/es/torcheck.po index 3dab419..7201363 100644 --- a/es/torcheck.po +++ b/es/torcheck.po @@ -7,13 +7,14 @@ # Shyish <jgongarrido(a)hotmail.com>, 2011 # strel, 2013-2014 # strel, 2012 +# xocoyotzin, 2014 # Nyek <electromigracion(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 14:00+0000\n" -"Last-Translator: strel\n" +"PO-Revision-Date: 2014-05-07 13:40+0000\n" +"Last-Translator: xocoyotzin\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,7 +24,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Congratulations. This browser is configured to use Tor." -msgstr "Felicidades. Este navegador está configurado para usar Tor." +msgstr "Felicidades. Este navegador está configurado para utilizar Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " @@ -61,18 +62,18 @@ msgid "Your IP address appears to be: " msgstr "Su dirección IP parece ser: " msgid "Are you using Tor?" -msgstr "¿Está usando Tor?" +msgstr "¿Está utilizando Tor?" msgid "This page is also available in the following languages:" msgstr "Esta página también está disponible en los siguientes idiomas:" msgid "For more information about this exit relay, see:" -msgstr "Para más información acerca de este repetidor ('relay'), vea:" +msgstr "Para más información acerca de este repetidor de salida ('exit relay'), vea:" msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " "development, and education of online anonymity and privacy." -msgstr "El Projecto Tor es una US 501(c)(3) sin ánimo de lucro dedicada a la investigación, desarrollo y educación sobre anonimidad y privacidad en línea." +msgstr "El Projecto Tor es una entidad US 501(c)(3) sin ánimo de lucro dedicada a investigar, desarrollar y educar acerca del anonimato y la privacidad en línea." msgid "Learn More »" msgstr "Aprender más »" @@ -84,7 +85,7 @@ msgid "Short User Manual" msgstr "Manual breve de usuario" msgid "Donate to Support Tor" -msgstr "Done para apoyar Tor" +msgstr "Done para apoyar a Tor" msgid "Tor Q&A Site" msgstr "Preguntas y respuestas de Tor" @@ -99,4 +100,4 @@ msgid "JavaScript is disabled." msgstr "JavaScript está deshabilitado." msgid "However, it does not appear to be the Tor Browser Bundle." -msgstr "Sin embargo, no parece que sea el Paquete de Navegador Tor." +msgstr "Sin embargo, no parece ser el Paquete de Navegador Tor."

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 07 May '14

07 May '14

commit 8f927fe8c2330733096b8654bbe770627f20c416 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 7 13:45:10 2014 +0000 Update translations for torcheck --- es/torcheck.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/es/torcheck.po b/es/torcheck.po index 3dab419..7201363 100644 --- a/es/torcheck.po +++ b/es/torcheck.po @@ -7,13 +7,14 @@ # Shyish <jgongarrido(a)hotmail.com>, 2011 # strel, 2013-2014 # strel, 2012 +# xocoyotzin, 2014 # Nyek <electromigracion(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 14:00+0000\n" -"Last-Translator: strel\n" +"PO-Revision-Date: 2014-05-07 13:40+0000\n" +"Last-Translator: xocoyotzin\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,7 +24,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Congratulations. This browser is configured to use Tor." -msgstr "Felicidades. Este navegador está configurado para usar Tor." +msgstr "Felicidades. Este navegador está configurado para utilizar Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " @@ -61,18 +62,18 @@ msgid "Your IP address appears to be: " msgstr "Su dirección IP parece ser: " msgid "Are you using Tor?" -msgstr "¿Está usando Tor?" +msgstr "¿Está utilizando Tor?" msgid "This page is also available in the following languages:" msgstr "Esta página también está disponible en los siguientes idiomas:" msgid "For more information about this exit relay, see:" -msgstr "Para más información acerca de este repetidor ('relay'), vea:" +msgstr "Para más información acerca de este repetidor de salida ('exit relay'), vea:" msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " "development, and education of online anonymity and privacy." -msgstr "El Projecto Tor es una US 501(c)(3) sin ánimo de lucro dedicada a la investigación, desarrollo y educación sobre anonimidad y privacidad en línea." +msgstr "El Projecto Tor es una entidad US 501(c)(3) sin ánimo de lucro dedicada a investigar, desarrollar y educar acerca del anonimato y la privacidad en línea." msgid "Learn More »" msgstr "Aprender más »" @@ -84,7 +85,7 @@ msgid "Short User Manual" msgstr "Manual breve de usuario" msgid "Donate to Support Tor" -msgstr "Done para apoyar Tor" +msgstr "Done para apoyar a Tor" msgid "Tor Q&A Site" msgstr "Preguntas y respuestas de Tor" @@ -99,4 +100,4 @@ msgid "JavaScript is disabled." msgstr "JavaScript está deshabilitado." msgid "However, it does not appear to be the Tor Browser Bundle." -msgstr "Sin embargo, no parece que sea el Paquete de Navegador Tor." +msgstr "Sin embargo, no parece ser el Paquete de Navegador Tor."

1 0

[torbrowser/master] Recommend 3.6.1. Keep 3.6.
by mikeperry＠torproject.org 07 May '14

07 May '14

commit 5d96ca57af26c043bb7095a77f7817e620cfe912 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed May 7 06:03:28 2014 -0700 Recommend 3.6.1. Keep 3.6. --- build-scripts/recommended-versions | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index b770f95..6c10a00 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,5 +1,8 @@ [ "3.6-Linux", "3.6-MacOS", -"3.6-Windows" +"3.6-Windows", +"3.6.1-Linux", +"3.6.1-MacOS", +"3.6.1-Windows" ]

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 07 May '14

07 May '14

commit 9ab5b8d6605ec4225818854be4cba827ccb2f926 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 7 11:45:22 2014 +0000 Update translations for tails-persistence-setup --- pt/pt.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt/pt.po b/pt/pt.po index 0f8ea0c..9fb6b60 100644 --- a/pt/pt.po +++ b/pt/pt.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-04-16 21:26+0200\n" -"PO-Revision-Date: 2014-05-07 11:14+0000\n" +"PO-Revision-Date: 2014-05-07 11:20+0000\n" "Last-Translator: sccosta <sonia.peres.costa(a)gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n" @@ -163,7 +163,7 @@ msgstr "Volume persistente não pode ser modificado. Talvez seja montado em moda #: ../lib/Tails/Persistence/Setup.pm:402 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." -msgstr "" +msgstr "O \"Tails\" não é executável nos dispositivos%s sem USB/SDIO " #: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format @@ -278,7 +278,7 @@ msgstr "" msgid "" "The selected files will be stored in the encrypted partition %s (%s), on the" " %s %s device." -msgstr "" +msgstr "Os ficheiros seleccionados não serão guardados na secção encriptada %s (%s), no dispositivo %s %s" #: ../lib/Tails/Persistence/Step/Configure.pm:74 msgid "Save"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 07 May '14

07 May '14

commit 441ca2b532dfeb78b1f95f9fdbf1bf8ba0b6f89d Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 7 11:15:20 2014 +0000 Update translations for tails-persistence-setup --- pt/pt.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pt/pt.po b/pt/pt.po index 3dcf9d3..0f8ea0c 100644 --- a/pt/pt.po +++ b/pt/pt.po @@ -5,15 +5,16 @@ # Translators: # kagazz <lourenxo_619(a)hotmail.com>, 2014 # alfalb_mansil <manuela.silva(a)sky.com>, 2014 -# Nizia Dantas <niziadantasyouversion(a)gmail.com>, 2014 +# Nizia Dantas <nizia.dantas(a)gmail.com>, 2014 # Drew Melim <nokostya.translation(a)gmail.com>, 2014 +# sccosta <sonia.peres.costa(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-04-16 21:26+0200\n" -"PO-Revision-Date: 2014-05-01 17:10+0000\n" -"Last-Translator: Drew Melim <nokostya.translation(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-07 11:14+0000\n" +"Last-Translator: sccosta <sonia.peres.costa(a)gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -172,7 +173,7 @@ msgstr "O dispositivo %s é ótico." #: ../lib/Tails/Persistence/Setup.pm:415 #, perl-format msgid "Device %s was not created using Tails Installer." -msgstr "" +msgstr "O dispositivo %s não foi criado através do instalador \"Tails\"" #: ../lib/Tails/Persistence/Setup.pm:450 msgid "Error" @@ -187,7 +188,7 @@ msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" "You may now close this application." -msgstr "" +msgstr "Qualquer alteração só será efectiva depois de reiniciar o \"Tails\".\nPode fechar agora esta aplicação" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 msgid "Persistence wizard - Persistent volume creation"

1 0

[tor/master] Script to detect unused autoconf outputs
by nickm＠torproject.org 07 May '14

07 May '14

commit 2e1ac274abed4127a6a30b753297166caf59feb1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 7 03:56:51 2014 -0400 Script to detect unused autoconf outputs Should help speed up mingw builds by a percent or two. --- configure.ac | 4 +--- scripts/README | 3 +++ scripts/maint/check_config_macros.pl | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index a96a333..d321092 100644 --- a/configure.ac +++ b/configure.ac @@ -437,7 +437,6 @@ AC_CHECK_FUNCS([event_get_version \ event_get_version_number \ event_get_method \ event_set_log_callback \ - evdns_set_outgoing_bind_address \ evutil_secure_rng_set_urandom_device_file \ evutil_secure_rng_init \ event_base_loopexit]) @@ -445,7 +444,7 @@ AC_CHECK_MEMBERS([struct event.min_heap_idx], , , [#include <event.h> ]) -AC_CHECK_HEADERS(event2/event.h event2/dns.h event2/bufferevent_ssl.h) +AC_CHECK_HEADERS(event2/event.h event2/dns.h) LIBS="$save_LIBS" LDFLAGS="$save_LDFLAGS" @@ -1235,7 +1234,6 @@ if [[ $dmalloc -eq 1 ]]; then AC_CHECK_HEADERS(dmalloc.h, , AC_MSG_ERROR(dmalloc header file not found. Do you have the development files for dmalloc installed?)) AC_SEARCH_LIBS(dmalloc_malloc, [dmallocth dmalloc], , AC_MSG_ERROR(Libdmalloc library not found. If you enable it you better have it installed.)) AC_DEFINE(USE_DMALLOC, 1, [Debug memory allocation library]) - AC_DEFINE(DMALLOC_FUNC_CHECK, 1, [Enable dmalloc's malloc function check]) AC_CHECK_FUNCS(dmalloc_strdup dmalloc_strndup) fi diff --git a/scripts/README b/scripts/README index f2cb501..70c7639 100644 --- a/scripts/README +++ b/scripts/README @@ -6,6 +6,9 @@ Code maintenance scripts maint/checkLogs.pl -- Verify that Tor log statements are unique. +maint/check_config_macros.pl -- Look for autoconf tests whose results are +never used. + maint/checkOptionDocs.pl -- Make sure that Tor options are documented in the manpage, and that the manpage only documents real Tor options. diff --git a/scripts/maint/check_config_macros.pl b/scripts/maint/check_config_macros.pl new file mode 100755 index 0000000..bcde2be --- /dev/null +++ b/scripts/maint/check_config_macros.pl @@ -0,0 +1,20 @@ +#!/usr/bin/perl -w + +use strict; + +my @macros = (); + +open(F, 'orconfig.h.in'); +while(<F>) { + if (/^#undef +([A-Za-z0-9_]*)/) { + push @macros, $1; + } +} +close F; + +for my $m (@macros) { + my $s = `git grep '$m' src`; + if ($s eq '') { + print "Unused: $m\n"; + } +}

1 0

r26765: {website} Removed the section listing betas. (website/trunk/projects/en)
by Matt Pagan 07 May '14

07 May '14

Author: mttp Date: 2014-05-07 07:32:53 +0000 (Wed, 07 May 2014) New Revision: 26765 Modified: website/trunk/projects/en/torbrowser.wml Log: Removed the section listing betas. Modified: website/trunk/projects/en/torbrowser.wml =================================================================== --- website/trunk/projects/en/torbrowser.wml 2014-05-04 15:15:26 UTC (rev 26764) +++ website/trunk/projects/en/torbrowser.wml 2014-05-07 07:32:53 UTC (rev 26765) @@ -294,210 +294,6 @@ </div> </div> - <div id="downloads-beta" class="anchor"></div> - <div class="downloads box"> - <div class="pjtitle"><h2>Tor Browser Downloads - Beta</h2></div> - <div class="pjflavor">To start using the Tor Browser, download the file for your - preferred language. This file can be saved wherever is convenient, - e.g. the Desktop or a USB flash drive.</div> - <div class="pjtext"> - <div class="dltable" style="margin-top: -35px;"> - <table> - <thead> - <tr> - <th> Language</th> - <th>Microsoft Windows (<version-torbrowserbundlebeta>)</th> - <th>Mac OSX (<version-torbrowserbundleosx32beta>)</th> - <th>Linux (<version-torbrowserbundlelinux32beta>)</th> - </tr> - </thead> - <tbody> - <tr> - <td>English (en-US)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_en-US.exe">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_en-US.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_en-US.dmg">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_en-US.dmg.asc">sig</a>) -  - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_en-US.tar.xz">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_en-US.tar.xz.asc">sig</a>) - • <a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_en-US.tar.xz">64-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_en-US.tar.xz.asc">sig</a>)</td> - </tr> - <tr class="alt"> - <td>العربية (ar)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_ar.exe">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_ar.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_ar.dmg">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_ar.dmg.asc">sig</a>) -  - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_ar.tar.xz">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_ar.tar.xz.asc">sig</a>) - • <a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_ar.tar.xz">64-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_ar.tar.xz.asc">sig</a>)</td> - </tr> - <tr> - <td>Deutsch (de)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_de.exe">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_de.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_de.dmg">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_de.dmg.asc">sig</a>) -  - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_de.tar.xz">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_de.tar.xz.asc">sig</a>) - • <a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_de.tar.xz">64-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_de.tar.xz.asc">sig</a>)</td> - </tr> - <tr class="alt"> - <td>Español (es-ES)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_es-ES.exe">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_es-ES.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_es-ES.dmg">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_es-ES.dmg.asc">sig</a>) -  - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_es-ES.tar.xz">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_es-ES.tar.xz.asc">sig</a>) - • <a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_es-ES.tar.xz">64-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_es-ES.tar.xz.asc">sig</a>)</td> - </tr> - <tr> - <td>فارسی (fa)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_fa.exe">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_fa.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_fa.dmg">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_fa.dmg.asc">sig</a>) -  - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_fa.tar.xz">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_fa.tar.xz.asc">sig</a>) - • <a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_fa.tar.xz">64-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_fa.tar.xz.asc">sig</a>)</td> - </tr> - <tr class="alt"> - <td>Français (fr)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_fr.exe">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_fr.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_fr.dmg">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_fr.dmg.asc">sig</a>) -  - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_fr.tar.xz">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_fr.tar.xz.asc">sig</a>) - • <a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_fr.tar.xz">64-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_fr.tar.xz.asc">sig</a>)</td> - </tr> - <tr> - <td>Italiano (it)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_it.exe">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_it.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_it.dmg">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_it.dmg.asc">sig</a>) -  - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_it.tar.xz">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_it.tar.xz.asc">sig</a>) - • <a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_it.tar.xz">64-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_it.tar.xz.asc">sig</a>)</td> - </tr> - <tr class="alt"> - <td>Korean (ko)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_ko.exe">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_ko.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_ko.dmg">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_ko.dmg.asc">sig</a>) -  - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_ko.tar.xz">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_ko.tar.xz.asc">sig</a>) - • <a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_ko.tar.xz">64-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_ko.tar.xz.asc">sig</a>)</td> - </tr> - <tr> - <td>Nederlands (nl)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_nl.exe">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_nl.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_nl.dmg">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_nl.dmg.asc">sig</a>) -  - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_nl.tar.xz">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_nl.tar.xz.asc">sig</a>) - • <a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_nl.tar.xz">64-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_nl.tar.xz.asc">sig</a>)</td> - </tr> - <tr class="alt"> - <td>Polish (pl)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_pl.exe">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_pl.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_pl.dmg">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_pl.dmg.asc">sig</a>) -  - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_pl.tar.xz">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_pl.tar.xz.asc">sig</a>) - • <a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_pl.tar.xz">64-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_pl.tar.xz.asc">sig</a>)</td> - </tr> - <tr> - <td>Português (pt-PT)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_pt-PT.exe">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_pt-PT.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_pt-PT.dmg">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_pt-PT.dmg.asc">sig</a>) -  - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_pt-PT.tar.xz">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_pt-PT.tar.xz.asc">sig</a>) - • <a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_pt-PT.tar.xz">64-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_pt-PT.tar.xz.asc">sig</a>)</td> - </tr> - <tr class="alt"> - <td>Русский (ru)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_ru.exe">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_ru.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_ru.dmg">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_ru.dmg.asc">sig</a>) -  - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_ru.tar.xz">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_ru.tar.xz.asc">sig</a>) - • <a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_ru.tar.xz">64-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_ru.tar.xz.asc">sig</a>)</td> - </tr> - <tr> - <td>Vietnamese (vi)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_vi.exe">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_vi.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_vi.dmg">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_vi.dmg.asc">sig</a>) -  - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_vi.tar.xz">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_vi.tar.xz.asc">sig</a>) - • <a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_vi.tar.xz">64-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_vi.tar.xz.asc">sig</a>)</td> - </tr> - <tr class="alt"> - <td>简体字 (zh-CN)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_zh-CN.exe">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_zh-CN.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_zh-CN.dmg">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx32beta>-osx32_zh-CN.dmg.asc">sig</a>) -  - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_zh-CN.tar.xz">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_zh-CN.tar.xz.asc">sig</a>) - • <a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_zh-CN.tar.xz">64-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_zh-CN.tar.xz.asc">sig</a>)</td> - </tr> - </tbody> - </table> - </div> - See our instructions on <a href="<page docs/verifying-signatures>">how to verify package signatures</a>, which allows you to make sure you've downloaded the file we intended you to get. Also, note that the Firefox ESR in our bundles is

1 0

[tor/master] Fix test_pick_circid on 32-bit platforms
by nickm＠torproject.org 07 May '14

07 May '14

commit 8a2e66b623f470f8adb9c342d8b18d207be7f361 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 7 03:27:49 2014 -0400 Fix test_pick_circid on 32-bit platforms --- src/test/test_circuitlist.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/test/test_circuitlist.c b/src/test/test_circuitlist.c index 63c2edd..7b7d415 100644 --- a/src/test/test_circuitlist.c +++ b/src/test/test_circuitlist.c @@ -279,26 +279,26 @@ test_pick_circid(void *arg) chan1->circ_id_type = CIRC_ID_TYPE_LOWER; for (i = 0; i < 50; ++i) { circid = get_unique_circ_id_by_chan(chan1); - tt_int_op(0, <, circid); - tt_int_op(circid, <, (1<<15)); + tt_uint_op(0, <, circid); + tt_uint_op(circid, <, (1<<15)); } chan1->circ_id_type = CIRC_ID_TYPE_HIGHER; for (i = 0; i < 50; ++i) { circid = get_unique_circ_id_by_chan(chan1); - tt_int_op((1<<15), <, circid); - tt_int_op(circid, <, (1<<16)); + tt_uint_op((1<<15), <, circid); + tt_uint_op(circid, <, (1<<16)); } chan2->circ_id_type = CIRC_ID_TYPE_LOWER; for (i = 0; i < 50; ++i) { circid = get_unique_circ_id_by_chan(chan2); - tt_int_op(0, <, circid); - tt_int_op(circid, <, (1u<<31)); + tt_uint_op(0, <, circid); + tt_uint_op(circid, <, (1u<<31)); } chan2->circ_id_type = CIRC_ID_TYPE_HIGHER; for (i = 0; i < 50; ++i) { circid = get_unique_circ_id_by_chan(chan2); - tt_int_op((1u<<31), <, circid); + tt_uint_op((1u<<31), <, circid); } /* Now make sure that we can behave well when we are full up on circuits */ @@ -312,7 +312,7 @@ test_pick_circid(void *arg) tt_int_op(i, >, (1<<14)); break; } - tt_int_op(circid, <, (1<<15)); + tt_uint_op(circid, <, (1<<15)); tt_assert(! bitarray_is_set(ba, circid)); bitarray_set(ba, circid); channel_mark_circid_unusable(chan1, circid); @@ -321,8 +321,8 @@ test_pick_circid(void *arg) /* Make sure that being full on chan1 does not interfere with chan2 */ for (i = 0; i < 100; ++i) { circid = get_unique_circ_id_by_chan(chan2); - tt_int_op(circid, >, 0); - tt_int_op(circid, <, (1<<15)); + tt_uint_op(circid, >, 0); + tt_uint_op(circid, <, (1<<15)); channel_mark_circid_unusable(chan2, circid); }

1 0

[tor/master] Basic tests for get_unique_circ_id_by_chan.
by nickm＠torproject.org 07 May '14

07 May '14

commit 499e77663e67f48cc53a119b32d7eaaef11d46ec Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 7 02:57:50 2014 -0400 Basic tests for get_unique_circ_id_by_chan. --- src/or/circuitbuild.c | 4 ++- src/or/circuitbuild.h | 4 +++ src/test/test_circuitlist.c | 77 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 1 deletion(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index cd92326..9d06759 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -9,6 +9,8 @@ * \brief The actual details of building circuits. **/ +#define CIRCUITBUILD_PRIVATE + #include "or.h" #include "channel.h" #include "circpathbias.h" @@ -83,7 +85,7 @@ channel_connect_for_circuit(const tor_addr_t *addr, uint16_t port, * * Return it, or 0 if can't get a unique circ_id. */ -static circid_t +STATIC circid_t get_unique_circ_id_by_chan(channel_t *chan) { /* This number is chosen somewhat arbitrarily; see comment below for more diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index ebcb22c..71caea9 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -58,5 +58,9 @@ const char *build_state_get_exit_nickname(cpath_build_state_t *state); const node_t *choose_good_entry_server(uint8_t purpose, cpath_build_state_t *state); +#ifdef CIRCUITBUILD_PRIVATE +STATIC circid_t get_unique_circ_id_by_chan(channel_t *chan); +#endif + #endif diff --git a/src/test/test_circuitlist.c b/src/test/test_circuitlist.c index ad8d0ac..63c2edd 100644 --- a/src/test/test_circuitlist.c +++ b/src/test/test_circuitlist.c @@ -2,9 +2,11 @@ /* See LICENSE for licensing information */ #define TOR_CHANNEL_INTERNAL_ +#define CIRCUITBUILD_PRIVATE #define CIRCUITLIST_PRIVATE #include "or.h" #include "channel.h" +#include "circuitbuild.h" #include "circuitlist.h" #include "test.h" @@ -257,9 +259,84 @@ test_rend_token_maps(void *arg) circuit_free(TO_CIRCUIT(c4)); } +static void +test_pick_circid(void *arg) +{ + bitarray_t *ba = NULL; + channel_t *chan1, *chan2; + circid_t circid; + int i; + (void) arg; + + chan1 = tor_malloc_zero(sizeof(channel_t)); + chan2 = tor_malloc_zero(sizeof(channel_t)); + chan2->wide_circ_ids = 1; + + chan1->circ_id_type = CIRC_ID_TYPE_NEITHER; + tt_int_op(0, ==, get_unique_circ_id_by_chan(chan1)); + + /* Basic tests, with no collisions */ + chan1->circ_id_type = CIRC_ID_TYPE_LOWER; + for (i = 0; i < 50; ++i) { + circid = get_unique_circ_id_by_chan(chan1); + tt_int_op(0, <, circid); + tt_int_op(circid, <, (1<<15)); + } + chan1->circ_id_type = CIRC_ID_TYPE_HIGHER; + for (i = 0; i < 50; ++i) { + circid = get_unique_circ_id_by_chan(chan1); + tt_int_op((1<<15), <, circid); + tt_int_op(circid, <, (1<<16)); + } + + chan2->circ_id_type = CIRC_ID_TYPE_LOWER; + for (i = 0; i < 50; ++i) { + circid = get_unique_circ_id_by_chan(chan2); + tt_int_op(0, <, circid); + tt_int_op(circid, <, (1u<<31)); + } + chan2->circ_id_type = CIRC_ID_TYPE_HIGHER; + for (i = 0; i < 50; ++i) { + circid = get_unique_circ_id_by_chan(chan2); + tt_int_op((1u<<31), <, circid); + } + + /* Now make sure that we can behave well when we are full up on circuits */ + chan1->circ_id_type = CIRC_ID_TYPE_LOWER; + chan2->circ_id_type = CIRC_ID_TYPE_LOWER; + chan1->wide_circ_ids = chan2->wide_circ_ids = 0; + ba = bitarray_init_zero((1<<15)); + for (i = 0; i < (1<<15); ++i) { + circid = get_unique_circ_id_by_chan(chan1); + if (circid == 0) { + tt_int_op(i, >, (1<<14)); + break; + } + tt_int_op(circid, <, (1<<15)); + tt_assert(! bitarray_is_set(ba, circid)); + bitarray_set(ba, circid); + channel_mark_circid_unusable(chan1, circid); + } + tt_int_op(i, <, (1<<15)); + /* Make sure that being full on chan1 does not interfere with chan2 */ + for (i = 0; i < 100; ++i) { + circid = get_unique_circ_id_by_chan(chan2); + tt_int_op(circid, >, 0); + tt_int_op(circid, <, (1<<15)); + channel_mark_circid_unusable(chan2, circid); + } + + done: + tor_free(chan1); + tor_free(chan2); + bitarray_free(ba); + circuit_free_all(); +} + struct testcase_t circuitlist_tests[] = { { "maps", test_clist_maps, TT_FORK, NULL, NULL }, { "rend_token_maps", test_rend_token_maps, TT_FORK, NULL, NULL }, + { "pick_circid", test_pick_circid, TT_FORK, NULL, NULL }, END_OF_TESTCASES };

1 0