January 2013 - tor-commits - lists.torproject.org

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 29 Jan '13

29 Jan '13

commit 32181e02dd3ce990345cb627e388e04940c7913b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 29 12:15:08 2013 +0000 Update translations for gettor_completed --- lv/gettor.po | 174 +++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 112 insertions(+), 62 deletions(-) diff --git a/lv/gettor.po b/lv/gettor.po index 8b0025a..9055138 100644 --- a/lv/gettor.po +++ b/lv/gettor.po @@ -4,12 +4,13 @@ # # Translators: # Ojars Balcers <ojars.balcers(a)gmail.com>, 2012. +# Ojārs Balcers <ojars.balcers(a)gmail.com>, 2013. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-10-22 11:57+0000\n" +"POT-Creation-Date: 2013-01-19 13:40+0100\n" +"PO-Revision-Date: 2013-01-29 12:13+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -47,7 +48,7 @@ msgid "" "and then we'll ignore this email address for the next day or so.)" msgstr "(Mēs atvainojamies ja negaidīti saņēmāt šo e-pastu. Tā kā Jūsu e-pasts pienāca no e-pasta pakalpojumu programmas, kura neizmanto DKIM, mēs pievienojam arī īsu paskaidrojumu, pēc tam mēs aptuveni dienu ignorēsim šo e-pasta adresi.)" -#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 +#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:135 msgid "" "If you have any questions or it doesn't work, you can contact a\n" "human at this support email address: help(a)rt.torproject.org" @@ -63,22 +64,27 @@ msgid "" " macos-ppc\n" " linux-i386\n" " linux-x86_64\n" +" obfs-windows\n" +" obfs-macos-i386\n" +" obfs-macos-x86_64\n" +" obfs-linux-i386\n" +" obfs-linux-x86_64\n" " source" -msgstr "Es nosūtīšu Jums Tor pakotni, janorādīsiet, kuru vēlaties saņemt.\nLūdzu izvēlieties vienu no turpmāk nosauktajiem pakotņu vārdiem:\n\n windows\n macos-i386\n macos-ppc\n linux-i386\n linux-x86_64\n source" +msgstr "Es nosūtīšu Jums Tor'a pakotni, ja norādīsiet kura pakotne ir vajadzīga.\nLūdzu, izvēlieties vienu no turpmāk noradītajiem pakotņu nosaukumiem:\n\n windows\n macos-i386\n macos-ppc\n linux-i386\n linux-x86_64\n obfs-windows\n obfs-macos-i386\n obfs-macos-x86_64\n obfs-linux-i386\n obfs-linux-x86_64\n source" -#: lib/gettor/i18n.py:56 +#: lib/gettor/i18n.py:61 msgid "" "Please reply to this mail, and tell me a single package name anywhere \n" "in the body of your email." msgstr "Lūdzu atbildiet uz šo e-pastu, un jebkurā Jūsu e-pasta ziņojuma vietā\nnosauciet pakotnes nosaukumu." -#: lib/gettor/i18n.py:59 +#: lib/gettor/i18n.py:64 msgid "" "OBTAINING LOCALIZED VERSIONS OF TOR\n" "===================================" msgstr "TOR LOKALIZĒTO VERSIJU IEGŪŠANA\n==============================" -#: lib/gettor/i18n.py:62 +#: lib/gettor/i18n.py:67 msgid "" "To get a version of Tor translated into your language, specify the\n" "language you want in the address you send the mail to:\n" @@ -86,22 +92,22 @@ msgid "" " gettor+fa(a)torproject.org" msgstr "Lai saņemtu Tor versiju, kura ir pārtulkota Jūsu izvēlētajā valodā, norādiet \nvalodu, kuru vēlaties saņemt, izmantojot adresi, uz kuru sūtat e-pastu:\n\n gettor+fa(a)torproject.org" -#: lib/gettor/i18n.py:67 +#: lib/gettor/i18n.py:72 msgid "" "This example will give you the requested package in a localized\n" "version for Farsi (Persian). Check below for a list of supported language\n" "codes. " msgstr "Šis piemērs piegādās Jums pieprasīto pakotni farsi (persiešu) lokalizētajā versijā. Pārbaudiet zemāk atbalstīto valodu \nkodus. " -#: lib/gettor/i18n.py:71 +#: lib/gettor/i18n.py:76 msgid " List of supported locales:" msgstr "Atbalstīto lokalizāciju saraksts:" -#: lib/gettor/i18n.py:73 +#: lib/gettor/i18n.py:78 msgid "Here is a list of all available languages:" msgstr "Šis ir visu pieejamo valodu saraksts:" -#: lib/gettor/i18n.py:75 +#: lib/gettor/i18n.py:80 msgid "" " gettor+ar(a)torproject.org: Arabic\n" " gettor+de(a)torproject.org: German\n" @@ -116,24 +122,24 @@ msgid "" " gettor+zh(a)torproject.org: Chinese" msgstr " gettor+ar(a)torproject.org: arābu\n gettor+de(a)torproject.org: vācu\n gettor+en(a)torproject.org: angļu\n gettor+es(a)torproject.org: spāņu\n gettor+fa(a)torproject.org: farsi (irāņu)\n gettor+fr(a)torproject.org: franču\n gettor+it(a)torproject.org: itāļu\n gettor+nl(a)torproject.org: holandiešu\n gettor+pl(a)torproject.org: poļu\n gettor+ru(a)torproject.org: krievu\n gettor+zh(a)torproject.org: ķīniešu" -#: lib/gettor/i18n.py:87 +#: lib/gettor/i18n.py:92 msgid "If you select no language, you will receive the English version." msgstr "Ja nenorādīsiet valodu, saņemsiet angļu valodas versiju." -#: lib/gettor/i18n.py:89 +#: lib/gettor/i18n.py:94 msgid "" "SMALLER SIZED PACKAGES\n" "======================" msgstr "MAZĀKU IZMĒRU PAKOTNES\n=======================" -#: lib/gettor/i18n.py:92 +#: lib/gettor/i18n.py:97 msgid "" "If your bandwith is low or your provider doesn't allow you to\n" "receive large attachments in your email, GetTor can send you several\n" "small packages instead of one big one." msgstr "Ja joslas platums ir mazs vai Jūsu IPS neļauj e-pastā saņemt\nlielus pielikumus, GetTor var nosūtīt Jums vairākas\nmazas pakotnes vienas lielās pakotnes vietā." -#: lib/gettor/i18n.py:96 +#: lib/gettor/i18n.py:101 msgid "" "Simply include the keyword 'split' in a new line on its own (this part\n" "is important!) like so: \n" @@ -142,66 +148,66 @@ msgid "" " split" msgstr "Vienkārši ierakstiet atsevišķi atslēgvārdu 'split' jeb sadalīt jaunā rindā (tas ir \nsvarīgi!), kā norādīts: \n \n windows\n split" -#: lib/gettor/i18n.py:102 +#: lib/gettor/i18n.py:107 msgid "" "Sending this text in an email to GetTor will cause it to send you \n" "the Tor Browser Bundle in a number of 1,4MB attachments." msgstr "Ja e-pastā nosūtīsiet GetTor'am šo tekstu, saņemsiet Tor'a pārlūka komplektu vairāku 1,4 MB lielu pielikumu veidā." -#: lib/gettor/i18n.py:105 +#: lib/gettor/i18n.py:110 msgid "" "After having received all parts, you need to re-assemble them to \n" "one package again. This is done as follows:" msgstr "Pēc tam, kad visas daļas saņemtas, tās nepieciešams \natkal apvienot vienā pakotnē. To dara šādi:" -#: lib/gettor/i18n.py:108 +#: lib/gettor/i18n.py:113 msgid "1.) Save all received attachments into one folder on your disk." msgstr "1.) Saglabājiet visus saņemtos pielikumus vienā mapē uz sava diska." -#: lib/gettor/i18n.py:110 +#: lib/gettor/i18n.py:115 msgid "" "2.) Unzip all files ending in \".z\". If you saved all attachments to\n" "a fresh folder before, simply unzip all files in that folder. If you don't\n" "know how to unzip the .z files, please see the UNPACKING THE FILES section." msgstr "2.) Atzipojiet visas datnes, kuras beidzas ar \".z\". Ja esat iepriekš saglabājis visus pielikumus jaunā mapē, vienkārši atzipojiet visas datnes šajā mapē. Ja nezinat kā atzipot .z datnes, lūdzu, skatiet iedaļu DATŅU IZPAKOŠANA." -#: lib/gettor/i18n.py:114 +#: lib/gettor/i18n.py:119 msgid "" "3.) Verify all files as described in the mail you received with \n" "each package. (gpg --verify)" msgstr "3.) Verificējiet visas datnes atbilstīgi aprakstam \ne-pastā, kuru saņēmāt kopā ar katru no pakotnēm. (gpg --verify)" -#: lib/gettor/i18n.py:117 +#: lib/gettor/i18n.py:122 msgid "" "4.) Now unpack the multi-volume archive into one file by double-\n" "clicking the file ending in \"..split.part01.exe\". This should start the \n" "process automatically." msgstr "4.) Tagad izpakojiet daudzsējumu arhīvu vienā datnē, dubultnoklikšķinot\ndatni, kuras noaukums beidzas ar \"..split.part01.exe\". Šajā gadījumā procesam vajadzētu sākties automātiski." -#: lib/gettor/i18n.py:121 +#: lib/gettor/i18n.py:126 msgid "" "5.) After unpacking is finished, you should find a newly created \n" "\".exe\" file in your destination folder. Simply doubleclick\n" "that and Tor Browser Bundle should start within a few seconds." msgstr "5.) Kad atvēršana pabeigta, mērķa mapē vajadzētu būt jaunizveidotai datnei \n\".exe\". Dubultnoklikšķiniet uz to un Pārlūka Tor komplektam vajadzētu dažu sekunžu laikā startēties." -#: lib/gettor/i18n.py:125 +#: lib/gettor/i18n.py:130 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" msgstr "6.) Tas arī viss. Viss kārtībā. Paldies, ka izmantojat Tor, un, lai labi veicas!" -#: lib/gettor/i18n.py:127 +#: lib/gettor/i18n.py:132 msgid "" "SUPPORT\n" "=======" msgstr "ATBALSTS\n========" -#: lib/gettor/i18n.py:133 +#: lib/gettor/i18n.py:138 msgid "" "Here's your requested software as a zip file. Please unzip the\n" "package and verify the signature." msgstr "Šī ir Jūsu pieprasītā programmatūra zip datnes formā. Lūdzu, atzipojiet\npakotni un verificējiet parakstu." -#: lib/gettor/i18n.py:136 +#: lib/gettor/i18n.py:141 msgid "" "VERIFY SIGNATURE\n" "================\n" @@ -211,14 +217,14 @@ msgid "" " gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" msgstr "VERIFICĒJIET PARAKSTU\n====================\nJa uz Jūsu datora ir instalēts GnuPG, pēc zip datnes izpakošanas lietojiet komandrindas rīku gpg zemāk norādītajā veidā:\n\n gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" -#: lib/gettor/i18n.py:143 +#: lib/gettor/i18n.py:148 msgid "" "The output should look somewhat like this:\n" "\n" " gpg: Good signature from 'Erinn Clark <...>'" msgstr "Izvades rezultātam vajadzētu būt diezgan līdzīgam kā šim:\n\n gpg: Good signature from 'Erinn Clark <...>'" -#: lib/gettor/i18n.py:147 +#: lib/gettor/i18n.py:152 msgid "" "If you're not familiar with commandline tools, try looking for\n" "a graphical user interface for GnuPG on this website:\n" @@ -226,13 +232,13 @@ msgid "" " http://www.gnupg.org/related_software/frontends.html" msgstr "Ja neesat pazīstams ar komandrindas rīkiem, mēģiniet zemāk norādītājā \nmājaslapā atrast grafisku lietotāja saskarni, kura domāta GnuPG:\n\n http://www.gnupg.org/related_software/frontends.html" -#: lib/gettor/i18n.py:152 +#: lib/gettor/i18n.py:157 msgid "" "BLOCKED ACCESS / CENSORSHIP\n" "===========================" msgstr "BLOĶĒTA PIEKĻUVE / CENZŪRA\n=========================" -#: lib/gettor/i18n.py:155 +#: lib/gettor/i18n.py:160 msgid "" "If your Internet connection blocks access to the Tor network, you\n" "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n" @@ -242,7 +248,7 @@ msgid "" "to block all the bridges." msgstr "Ja Jūsu interneta savienojums bloķē piekļuvi tīklam Tor, Jums,\niespējams, ir nepieciešams tilta retranslators. Tilta retranslatori (vai īsāk \nrunājot - \"tilti\") ir Tor retranslatori kuri neatrodas sarakstā galvenā direktorijā. \nTā kā nav viena, pilna, publiski pieejama šo tiltu saraksta, tad pat ja Jūsu IPS \nfiltrē savienojumus uz visiem zināmajiem Tor retranslatoriem, ticami, ka \nviņiem neizdosies nobloķēt visus tltus." -#: lib/gettor/i18n.py:162 +#: lib/gettor/i18n.py:167 msgid "" "You can acquire a bridge by sending an email that contains \"get bridges\"\n" "in the body of the email to the following email address:\n" @@ -250,13 +256,20 @@ msgid "" " bridges(a)torproject.org" msgstr "Jūs varat saņemt tiltu sarakstu, nosūtot e-pasta ziņojumu, kurā ir rinda \n\"get bridges\", uz šādu e-pasta adresi:\n\n bridges(a)torproject.org" -#: lib/gettor/i18n.py:167 +#: lib/gettor/i18n.py:172 msgid "" "It is also possible to fetch bridges with a web browser at the following\n" "url: https://bridges.torproject.org/" msgstr "Ar tīmekļa pārlūka palīdzību arī ir iespējams ienest tiltus, sekojot \nurl: https://bridges.torproject.org/" -#: lib/gettor/i18n.py:170 +#: lib/gettor/i18n.py:175 +msgid "" +"Another censorship circumvention tool you can request from GetTor is\n" +"the Tor Obfsproxy Browser Bundle. Please read the package descriptions for\n" +"which package you should request to receive this." +msgstr "Cits, no GetTor pieprasāms cenzūras apiešanas rīks ir Tor'a Obfsproxy Browser Bundle. Lūdzu, izlasiet pakotņu aprakstus, lai uzzinātu kura no tām ir tā, kas jāpieprasa." + +#: lib/gettor/i18n.py:179 msgid "" "IMPORTANT NOTE:\n" "Since this is part of a split-file request, you need to wait for\n" @@ -265,32 +278,32 @@ msgid "" "first file." msgstr "SVARĪGA PIEZĪME:\nTā kā šī ir daļa no sadalītu datņu pieprasījuma, Jums jāsagaida\nvisas sadalītās datnes, pirms varat tās visas saglabāt\nvienā direktorijā, un atvērt tās, dubultnoklikšķinot uz pirmās datnes." -#: lib/gettor/i18n.py:176 +#: lib/gettor/i18n.py:185 msgid "" "Packages might arrive out of order! Please make sure you received\n" "all packages before you attempt to unpack them!" msgstr "Pakotnes var nepienākt secīgi! Lūdzu, pārliecinieties, ka esat saņēmis\nvisas pakotnes, pirms mēģiniet tās atvērt!" -#: lib/gettor/i18n.py:179 +#: lib/gettor/i18n.py:188 #, python-format msgid "" "It was successfully understood. Your request is currently being processed.\n" "Your package (%s) should arrive within the next ten minutes." msgstr "Ziņojums ir sekmīgi saprasts. Jūsu pieprasījums tiek apstrādāts.\nJūsu pakotnei (%s) vajadzētu ierasties tuvāko desmit minūšu laikā." -#: lib/gettor/i18n.py:182 +#: lib/gettor/i18n.py:191 msgid "" "If it doesn't arrive, the package might be too big for your mail provider.\n" "Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account." msgstr "Ja tā nepienāk, pakotne, iespējams, ir pārāk liela Jūsu e-pasta pakalpojumu\nsniedzēja sistēmai. Mēģiniet vēlreiz nosūtīt e-pasta ziņojumu no GMAIL.COM, YAHOO.CN vai YAHOO.COM konta" -#: lib/gettor/i18n.py:185 +#: lib/gettor/i18n.py:194 msgid "" "Unfortunately we are currently experiencing problems and we can't fulfill\n" "your request right now. Please be patient as we try to resolve this issue." msgstr "Diemžēl mums ir tehniski sarežģījumi, un mēs nevaram tūlīt izpildīt\nJūsu pieprasījumu. Lūdzu, esiet pacietīgs, jo mēs risinām šo problēmu." -#: lib/gettor/i18n.py:188 +#: lib/gettor/i18n.py:197 msgid "" "Unfortunately there is no split package available for the package you\n" "requested. Please send us another package name or request the same package \n" @@ -298,13 +311,13 @@ msgid "" "package. Make sure this is what you want." msgstr "Diemžēl Jūsu pieprasītajai pakotnei nav pieejama sadalītā pakotne.\nLūdzu nosūtiet mums citas pakotnes nosaukumu vai pieprasiet to pašu\npakonti vēlreiz, bet noņemiet atslēgvārdu 'split' jeb sadalīt. Tad mēs Jums nosūtīsim pilnu pakotni. Pārliecinieties, ka tas tiešām ir tas, ko Jūs vēlaties." -#: lib/gettor/i18n.py:193 +#: lib/gettor/i18n.py:202 msgid "" "UNPACKING THE FILES\n" "===================" msgstr "DATŅU IZPAKOŠANA\n================" -#: lib/gettor/i18n.py:196 +#: lib/gettor/i18n.py:205 msgid "" "The easiest way to unpack the files you received is to install 7-Zip,\n" "a free file compression/uncompression tool. If it isn't installed on\n" @@ -313,13 +326,13 @@ msgid "" " http://www.7-zip.org/" msgstr "Vienkāršākais veids kā izvērst datnes ir instalēt 7-Zip,\nkurš ir bezmaksas rīks datņu saspiešanai/izvēršanai. Ja tas nav instalēts\nJūsu datorā, varat to lejupielādēt te:\n\n http://www.7-zip.org/" -#: lib/gettor/i18n.py:202 +#: lib/gettor/i18n.py:211 msgid "" "When 7-Zip is installed, you can open the .z archive you received from\n" "us by double-clicking on it." msgstr "Kad 7-Zip ir instalēts, dubultnoklikšķinot uz to, varat atvērt .z arhīvu, kuru saņēmāt no mums." -#: lib/gettor/i18n.py:205 +#: lib/gettor/i18n.py:214 msgid "" "An alternative way to get the .z files extraced is to rename them to\n" ".zip. For example, if you recevied a file called \"windows.z\", rename it to \n" @@ -327,13 +340,13 @@ msgid "" "file archiver programs that probably are already installed on your computer." msgstr "Alternatīvs veids kā izvērst .z datnes ir tās pārsaukt par .zip. \nPiemēram, ja Jūs saņēmāt datni \"windows.z\", pārsauciet to par\n\"windows.zip\". Tad vajadzētu varēt šo arhīvu izvērst ar parastajām datņu\narhivēšanas programmām, kuras, ticami, jau ir instalētas Jūsu datorā." -#: lib/gettor/i18n.py:210 +#: lib/gettor/i18n.py:219 msgid "" "Please reply to this mail, and tell me a single package name anywhere\n" "in your reply. Here's a short explanation of what these packages are:" msgstr "Lūdzu, atbildiet uz šo e-pastu, atbildē norādot vienas pakotnes nosaukumu.\nTe ir īss skaidrojums par šīm pakotnēm:" -#: lib/gettor/i18n.py:213 +#: lib/gettor/i18n.py:222 msgid "" "windows:\n" "The Tor Browser Bundle package for Windows operating systems. If you're \n" @@ -341,59 +354,96 @@ msgid "" "Windows 7, this is the package you should get." msgstr "windows:\nPārlūka Tor komplekts Windows operētājsistēmām. Ja lietojat \nkādu no Windows versijām, kā Windows XP, Windows Vista vai \nWindows 7, Jums būtu vajadzīga šī pakotne." -#: lib/gettor/i18n.py:218 +#: lib/gettor/i18n.py:227 msgid "" "macos-i386:\n" "The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n" "general, newer Mac hardware will require you to use this package." msgstr "macos-i386:\nPārlūka Tor komplekts priekš OS X un centrālā Intel procesora arhitektūrai.\nVispārīgi runājot, jaunākiem makintošiem būs jālieto šī pakotne." -#: lib/gettor/i18n.py:222 +#: lib/gettor/i18n.py:231 msgid "" "macos-ppc:\n" "This is an older installer (the \"Vidalia bundle\") for older Macs running\n" "OS X on PowerPC CPUs. Note that this package will be deprecated soon." msgstr "macos-ppc:\nŠī ir vecāka instalēšanas programma (\"Komplekts Vidalia\") vecākiem\nmakintošiem, kuriem ir OS X un centrālie PowerPC procesori. Ievērojiet, ka\ndrīz šī pakotne vairs netiks atbalstīta." -#: lib/gettor/i18n.py:226 +#: lib/gettor/i18n.py:235 msgid "" "linux-i386:\n" "The Tor Browser Bundle package for Linux, 32bit versions." msgstr "linux-i386:\nPārlūka Tor komplekts Linux'a 32 bit'u versijām." -#: lib/gettor/i18n.py:229 +#: lib/gettor/i18n.py:238 msgid "" "Note that this package is rather large and needs your email provider to \n" "allow for attachments of about 30MB in size." msgstr "Ievērojiet, ka šī pakotne ir salīdzinoši liela un, lai to piegādātu, ir nepieciešams, ka e-pasta pakalpojumu sniedzējs \nļautu piegādāt pielikumus, kuri ir apmēram 30 MB lieli." -#: lib/gettor/i18n.py:232 +#: lib/gettor/i18n.py:241 msgid "" "linux-x86_64:\n" "The Tor Browser Bundle package for Linux, 64bit versions." msgstr "linux-x86_64:\nPārlūka Tor komplekts Linux'a 64 bit versijām." -#: lib/gettor/i18n.py:235 +#: lib/gettor/i18n.py:244 +msgid "" +"obfs-windows:\n" +"The Tor Obfsproxy Browser Bundle for Windows operating systems. If you need\n" +"strong censorship circumvention and you are running some version of the \n" +"Windows, like Windows XP, Windows Vista or Windows 7, this is the package\n" +"you should get." +msgstr "obfs-windows:\nTor'a Obfsproxy Browser Bundle Windows operētājsistēmām. Ja jāapiet stipra cenzūra un izmantojat kādu no Windows OS, piem., Windows XP, Windows Vista vai Windows 7, tad šī ir īstā pakotne." + +#: lib/gettor/i18n.py:250 +msgid "" +"obfs-macos-i386:\n" +"The Tor Obfsproxy Browser Bundle package for OS X, 32bit Intel CPU \n" +"architecture." +msgstr "obfs-macos-i386:\nTor'a Obfsproxy Browser Bundle pakotne OS X 32 bitu Intel CPU \narhitektūrai." + +#: lib/gettor/i18n.py:254 +msgid "" +"obfs-macos-x86_64:\n" +"The Tor Obfsproxy Browser Bundle package for OS X, 64bit Intel CPU \n" +"architecture." +msgstr "obfs-macos-x86_64:\nTor'a Obfsproxy Browser Bundle pakotne OS X 64 bitu Intel CPU \narhitektūrai." + +#: lib/gettor/i18n.py:258 +msgid "" +"obfs-linux-i386:\n" +"The Tor Obfsproxy Browser Bundle package for Linux, 32bit Intel CPU \n" +"architecture." +msgstr "obfs-linux-i386:\nTor'a Obfsproxy Browser Bundle pakotne Linux'a 32 bitu Intel CPU \narhitektūrai." + +#: lib/gettor/i18n.py:262 +msgid "" +"obfs-linux-x86_64:\n" +"The Tor Obfsproxy Browser Bundle package for Linux, 64bit Intel CPU \n" +"architecture." +msgstr "obfs-linux-x86_64:\nTor'a Obfsproxy Browser Bundle pakotne Linux'a 64bitu Intel CPU \narhitektūrai." + +#: lib/gettor/i18n.py:266 msgid "" "source:\n" "The Tor source code, for experts. Most users do not want this package." msgstr "pirmkods:\nTor pirmkods, ekspertiem. Vairums lietotāju nav vajadzīga šī pakotne." -#: lib/gettor/i18n.py:238 +#: lib/gettor/i18n.py:269 msgid "" "FREQUENTLY ASKED QUESTIONS\n" "==========================" msgstr "BIEŽI UZDOTIE JAUTĀJUMI\n====================" -#: lib/gettor/i18n.py:241 +#: lib/gettor/i18n.py:272 msgid "What is Tor?" msgstr "Kas ir Tor?" -#: lib/gettor/i18n.py:243 +#: lib/gettor/i18n.py:274 msgid "The name \"Tor\" can refer to several different components." msgstr "Nosaukums \"Tor\" var attiekties uz vairākiem atšķirīgiem komponentiem." -#: lib/gettor/i18n.py:245 +#: lib/gettor/i18n.py:276 msgid "" "The Tor software is a program you can run on your computer that helps \n" "keep you safe on the Internet. Tor protects you by bouncing your \n" @@ -406,22 +456,22 @@ msgid "" " https://www.torproject.org/about/overview.html.en" msgstr "Tor ir programma, kuru varat izpildīt uz sava datora un kura palīdz\nnodrošināt Jūsu drošību Internet'ā. Tor aizsargā Jūs, pārsūtot Jūsu\nsaziņu caur izkliedētu retranslatoru tīklu, kuru uztur brīvprātīgie visā\npasaulē: tas liedz tiem, kas novēro Jūsu interneta savienojumu,\nuzzināt, kuras tīmekļa vietnes apmeklējat, un liedz Jūsu apmeklētajām\nvietnēm noskaidrot Jūsu fizisko atrašanās vietu. Šo brīvprātīgo retranslatoru\nkopumu sauc Tor tīkls. Par to, kā Tor strādā, varat vairāk uzzināt te:\n\n https://www.torproject.org/about/overview.html.en" -#: lib/gettor/i18n.py:255 +#: lib/gettor/i18n.py:286 msgid "What is the Tor Browser Bundle?" msgstr "Kas ir pārlūka Tor komplekts?" -#: lib/gettor/i18n.py:257 +#: lib/gettor/i18n.py:288 msgid "" "The Browser Bundle (TBB) is the package we recommend to most users. \n" "The bundle comes with everything you need to safely browse the Internet.\n" "Just extract it and run." msgstr "Pārlūka Tor komplekts (TBB) ir pakotne, kuru iesakām vairumam lietotāju. \nKomplekts ietver visu, kas ir nepieciešams, lai droši pārlūkotu Internet.\nIzvērsiet pakotni un palaidiet to." -#: lib/gettor/i18n.py:261 +#: lib/gettor/i18n.py:292 msgid "What package should I request?" msgstr "Kuru pakotni man pieprasīt?" -#: lib/gettor/i18n.py:263 +#: lib/gettor/i18n.py:294 msgid "" "This depends on the operating system you use. For instance, if your\n" "operating system is Microsoft Windows, you should request \"windows\". Here\n" @@ -429,19 +479,19 @@ msgid "" "systems there are suitable for:" msgstr "Tas ir atkarīgs no Jūsu lietotās operētājsistēmas. Piemēram, ja Jūsu\noperētājsistēma ir Microsoft Windows, Jums jāpieprasa \"windows\". Te\natrodas īss visu pieprasāmo pakotņu un tām piemēroto operētājsistēmu īss\nraksturojums:" -#: lib/gettor/i18n.py:268 +#: lib/gettor/i18n.py:299 msgid "How do I extract the file(s) you sent me?" msgstr "Kā lai izvēršu datni(-es) kuras man atsūtījāt?" -#: lib/gettor/i18n.py:270 +#: lib/gettor/i18n.py:301 msgid "QUESTION:" msgstr "JAUTĀJUMS:" -#: lib/gettor/i18n.py:272 +#: lib/gettor/i18n.py:303 msgid "ANSWER:" msgstr "ATBILDE:" -#: lib/gettor/i18n.py:274 +#: lib/gettor/i18n.py:305 #, python-format msgid "" "Sorry, but the package you requested (%s) is too large for your \n"

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 29 Jan '13

29 Jan '13

commit 79e13cbbd5d06c5dd9d3c9b6c64416d4f76764f4 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 29 12:15:05 2013 +0000 Update translations for gettor --- lv/gettor.po | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lv/gettor.po b/lv/gettor.po index 59ec0ab..9055138 100644 --- a/lv/gettor.po +++ b/lv/gettor.po @@ -4,12 +4,13 @@ # # Translators: # Ojars Balcers <ojars.balcers(a)gmail.com>, 2012. +# Ojārs Balcers <ojars.balcers(a)gmail.com>, 2013. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-01-19 12:48+0000\n" +"PO-Revision-Date: 2013-01-29 12:13+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -69,7 +70,7 @@ msgid "" " obfs-linux-i386\n" " obfs-linux-x86_64\n" " source" -msgstr "" +msgstr "Es nosūtīšu Jums Tor'a pakotni, ja norādīsiet kura pakotne ir vajadzīga.\nLūdzu, izvēlieties vienu no turpmāk noradītajiem pakotņu nosaukumiem:\n\n windows\n macos-i386\n macos-ppc\n linux-i386\n linux-x86_64\n obfs-windows\n obfs-macos-i386\n obfs-macos-x86_64\n obfs-linux-i386\n obfs-linux-x86_64\n source" #: lib/gettor/i18n.py:61 msgid "" @@ -266,7 +267,7 @@ msgid "" "Another censorship circumvention tool you can request from GetTor is\n" "the Tor Obfsproxy Browser Bundle. Please read the package descriptions for\n" "which package you should request to receive this." -msgstr "" +msgstr "Cits, no GetTor pieprasāms cenzūras apiešanas rīks ir Tor'a Obfsproxy Browser Bundle. Lūdzu, izlasiet pakotņu aprakstus, lai uzzinātu kura no tām ir tā, kas jāpieprasa." #: lib/gettor/i18n.py:179 msgid "" @@ -392,35 +393,35 @@ msgid "" "strong censorship circumvention and you are running some version of the \n" "Windows, like Windows XP, Windows Vista or Windows 7, this is the package\n" "you should get." -msgstr "" +msgstr "obfs-windows:\nTor'a Obfsproxy Browser Bundle Windows operētājsistēmām. Ja jāapiet stipra cenzūra un izmantojat kādu no Windows OS, piem., Windows XP, Windows Vista vai Windows 7, tad šī ir īstā pakotne." #: lib/gettor/i18n.py:250 msgid "" "obfs-macos-i386:\n" "The Tor Obfsproxy Browser Bundle package for OS X, 32bit Intel CPU \n" "architecture." -msgstr "" +msgstr "obfs-macos-i386:\nTor'a Obfsproxy Browser Bundle pakotne OS X 32 bitu Intel CPU \narhitektūrai." #: lib/gettor/i18n.py:254 msgid "" "obfs-macos-x86_64:\n" "The Tor Obfsproxy Browser Bundle package for OS X, 64bit Intel CPU \n" "architecture." -msgstr "" +msgstr "obfs-macos-x86_64:\nTor'a Obfsproxy Browser Bundle pakotne OS X 64 bitu Intel CPU \narhitektūrai." #: lib/gettor/i18n.py:258 msgid "" "obfs-linux-i386:\n" "The Tor Obfsproxy Browser Bundle package for Linux, 32bit Intel CPU \n" "architecture." -msgstr "" +msgstr "obfs-linux-i386:\nTor'a Obfsproxy Browser Bundle pakotne Linux'a 32 bitu Intel CPU \narhitektūrai." #: lib/gettor/i18n.py:262 msgid "" "obfs-linux-x86_64:\n" "The Tor Obfsproxy Browser Bundle package for Linux, 64bit Intel CPU \n" "architecture." -msgstr "" +msgstr "obfs-linux-x86_64:\nTor'a Obfsproxy Browser Bundle pakotne Linux'a 64bitu Intel CPU \narhitektūrai." #: lib/gettor/i18n.py:266 msgid ""

1 0

[metrics-web/master] Add microdesc consensuses to @type list.
by karsten＠torproject.org 29 Jan '13

29 Jan '13

commit a3710052108be1a2c55220d6453ac9159e75f581 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jan 29 10:53:39 2013 +0100 Add microdesc consensuses to @type list. --- web/WEB-INF/formats.jsp | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp index a73adad..966856a 100644 --- a/web/WEB-INF/formats.jsp +++ b/web/WEB-INF/formats.jsp @@ -80,6 +80,7 @@ are recent: <li><tt>@type dir-key-certificate-3 1.0</tt></li> <li><tt>@type network-status-consensus-3 1.0</tt></li> <li><tt>@type network-status-vote-3 1.0</tt></li> +<li><tt>@type network-status-microdesc-consensus-3 1.0</tt></li> <li><tt>@type bridge-network-status 1.0</tt></li> <li><tt>@type bridge-server-descriptor 1.0</tt></li> <li><tt><font color="gray">@type bridge-extra-info 1.0</font></tt></li>

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 29 Jan '13

29 Jan '13

commit 83b1adeb0c68721ce184818547d59591f2bf1774 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 29 00:45:48 2013 +0000 Update translations for https_everywhere --- sl/ssl-observatory.dtd | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/sl/ssl-observatory.dtd b/sl/ssl-observatory.dtd index 185beca..d900a72 100644 --- a/sl/ssl-observatory.dtd +++ b/sl/ssl-observatory.dtd @@ -27,8 +27,7 @@ vsiljivo poslovno omrežje:"> "Varno, razen če uporabljate poslovno omrežje s tajnimi imeni lokalnih strežnikov:"> <!ENTITY ssl-observatory.prefs.alt_roots -"Submit and check certificates signed by non-standard root CAs -Predloži in preveri certifikate nestandardnih overoviteljev"> +"Predloži in preveri certifikate nestandardnih overoviteljev"> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip "Omogočanje tega je varno (in priporočljivo), razen če uporabljate vsiljivo poslovno omrežje ali protivirusni program Kaspersky, ki spremlja vaše brskanje s TLS proksijem in privatnim overoviteljem certifikatov. Če je omogočeno v takem omrežju lahko ta možnost objavi dokazila o tem, katere https:// domene so bile obiskane preko tega proksija, ker bi ustvarila edinstvene certifikate. Zato je to privzeto izključeno."> @@ -43,9 +42,9 @@ Predloži in preveri certifikate nestandardnih overoviteljev"> "Ko zasledite nov certifikat povejte Observatoriju h kateremu internetnemu ponudniku ste priključeni"> <!ENTITY ssl-observatory.prefs.asn_tooltip -""> +"To bo pridobilo in poslalo "Avtonomno številko sistema" (ASN) vašega omrežja. To nam bo pomagalo locirati napade na HTTPS in določiti, ali so opažanja iz omrežij na področjih kot so Iran in Sirija, kjer so napadi razmeroma pogosti."> -<!ENTITY ssl-observatory.prefs.done ""> +<!ENTITY ssl-observatory.prefs.done "Končano"> <!ENTITY ssl-observatory.prefs.explanation ""> @@ -59,16 +58,16 @@ Mouseover the options for further details:">--> ""> -<!ENTITY ssl-observatory.prefs.hide ""> +<!ENTITY ssl-observatory.prefs.hide "Skrij napredne možnosti"> <!ENTITY ssl-observatory.prefs.nonanon -""> +"Preveri certifikate tudi če ni Tor omrežja"> <!ENTITY ssl-observatory.prefs.nonanon_tooltip -""> +"Poskušali bomo ohraniti anonimnost podatkov, vendar je ta možnost manj varna"> <!ENTITY ssl-observatory.prefs.priv_dns -""> +"Predloži in preveri certifikate za ne-javna imena DNS"> <!ENTITY ssl-observatory.prefs.priv_dns_tooltip "">

1 0

[tor/master] squash! Implement Path use bias accounting.
by andrea＠torproject.org 29 Jan '13

29 Jan '13

commit 06a1d0b0447d3766b6199135f6878c6ce047f3b1 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Jan 20 14:24:25 2013 -0800 squash! Implement Path use bias accounting. Make a debug log more informative. --- src/or/circuitbuild.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 105e1ac..a4c67cf 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1582,9 +1582,11 @@ pathbias_count_use_attempt(origin_circuit_t *circ) pathbias_check_use_rate(guard); guard->use_attempts++; - log_debug(LD_CIRC, "Marked circuit %d as used for guard %s=%s.", - circ->global_identifier, guard->nickname, - hex_str(guard->identity, DIGEST_LEN)); + log_debug(LD_CIRC, + "Marked circuit %d (%f/%f) as used for guard %s=%s.", + circ->global_identifier, + guard->use_successes, guard->use_attempts, + guard->nickname, hex_str(guard->identity, DIGEST_LEN)); } circ->path_state = PATH_STATE_USE_ATTEMPTED; @@ -1664,9 +1666,11 @@ pathbias_count_use_success(origin_circuit_t *circ) guard->use_successes++; log_debug(LD_CIRC, - "Marked circuit %d as used successfully for guard %s=%s.", - circ->global_identifier, guard->nickname, - hex_str(guard->identity, DIGEST_LEN)); + "Marked circuit %d (%f/%f) as used successfully for guard " + "%s=%s.", + circ->global_identifier, guard->use_successes, + guard->use_attempts, guard->nickname, + hex_str(guard->identity, DIGEST_LEN)); } }

1 0

[tor/master] squash! Remove a source of error during path bias scaling
by andrea＠torproject.org 29 Jan '13

29 Jan '13

commit b810d322bfc55d202dbbd2e8ebe4529cf0778c8b Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Jan 20 14:30:02 2013 -0800 squash! Remove a source of error during path bias scaling Improve debug logs and fix a state fencepost error. --- src/or/circuitbuild.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index a4c67cf..97a26dd 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2105,6 +2105,9 @@ pathbias_count_circs_in_states(entry_guard_t *guard, fast_memeq(guard->identity, ocirc->cpath->extend_info->identity_digest, DIGEST_LEN)) { + log_debug(LD_CIRC, "Found opened circuit %d in path_state %s", + ocirc->global_identifier, + pathbias_state_to_string(ocirc->path_state)); open_circuits++; } } @@ -2245,7 +2248,7 @@ pathbias_check_use_rate(entry_guard_t *guard) const int scale_factor = pathbias_get_scale_factor(options); const int mult_factor = pathbias_get_mult_factor(options); int opened_attempts = pathbias_count_circs_in_states(guard, - PATH_STATE_USE_ATTEMPTED, PATH_STATE_USE_ATTEMPTED); + PATH_STATE_USE_ATTEMPTED, PATH_STATE_USE_SUCCEEDED); guard->use_attempts -= opened_attempts; guard->use_attempts *= mult_factor; @@ -2257,8 +2260,8 @@ pathbias_check_use_rate(entry_guard_t *guard) guard->use_attempts += opened_attempts; log_info(LD_CIRC, - "Scaled pathbias use counts to %f/%f for guard %s=%s", - guard->use_successes, guard->use_attempts, + "Scaled pathbias use counts to %f/%f (%d open) for guard %s=%s", + guard->use_successes, guard->use_attempts, opened_attempts, guard->nickname, hex_str(guard->identity, DIGEST_LEN)); } @@ -2416,10 +2419,11 @@ pathbias_check_close_rate(entry_guard_t *guard) guard->circ_successes += opened_built; log_info(LD_CIRC, - "Scaled pathbias counts to (%f,%f)/%f for guard %s=%s", + "Scaled pathbias counts to (%f,%f)/%f (%d/%d open) for guard " + "%s=%s", guard->circ_successes, guard->successful_circuits_closed, - guard->circ_attempts, guard->nickname, - hex_str(guard->identity, DIGEST_LEN)); + guard->circ_attempts, opened_built, opened_attempts, + guard->nickname, hex_str(guard->identity, DIGEST_LEN)); } return 0;

1 0

[tor/master] Prevent early close of path bias testing circuits.
by andrea＠torproject.org 29 Jan '13

29 Jan '13

commit f858370233a7d01d89949f79f92e8b67acd69f46 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Jan 19 21:16:24 2013 -0800 Prevent early close of path bias testing circuits. We need to let them live long enough to perform the test. --- src/or/circuituse.c | 5 ++++- src/or/rendservice.c | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 0b2fe9e..48a7743 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1078,7 +1078,10 @@ circuit_expire_old_circuits_clientside(void) "purpose %d)", circ->n_circ_id, (long)(now.tv_sec - circ->timestamp_dirty), circ->purpose); - circuit_mark_for_close(circ, END_CIRC_REASON_FINISHED); + /* Don't do this magic for testing circuits. Their death is governed + * by circuit_expire_building */ + if (circ->purpose != CIRCUIT_PURPOSE_PATH_BIAS_TESTING) + circuit_mark_for_close(circ, END_CIRC_REASON_FINISHED); } else if (!circ->timestamp_dirty && circ->state == CIRCUIT_STATE_OPEN) { if (timercmp(&circ->timestamp_began, &cutoff, <)) { if (circ->purpose == CIRCUIT_PURPOSE_C_GENERAL || diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 3b2eeb4..f115d8b 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3068,7 +3068,8 @@ rend_services_introduce(void) if (intro->time_expiring + INTRO_POINT_EXPIRATION_GRACE_PERIOD > now) { /* This intro point has completely expired. Remove it, and * mark the circuit for close if it's still alive. */ - if (intro_circ != NULL) { + if (intro_circ != NULL && + intro_circ->base_.purpose != CIRCUIT_PURPOSE_PATH_BIAS_TESTING) { circuit_mark_for_close(TO_CIRCUIT(intro_circ), END_CIRC_REASON_FINISHED); }

1 0

[tor/master] Bug 8024: Check for null/closed channel before probing.
by andrea＠torproject.org 29 Jan '13

29 Jan '13

commit a78542f0c30a6d8a25b3a8c92fec61c04c3feeaf Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Jan 22 21:03:28 2013 -0800 Bug 8024: Check for null/closed channel before probing. --- changes/bug7802 | 1 + src/or/circuitbuild.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/changes/bug7802 b/changes/bug7802 index 1d09757..9bc0f36 100644 --- a/changes/bug7802 +++ b/changes/bug7802 @@ -8,3 +8,4 @@ - Remove a source of rounding error during path bias count scaling. - Don't count cannibalized circuits as used for path bias until we actually try to use them. + - Fix circuit_package_relay_cell warning message about n_chan==NULL. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 97a26dd..e3a9d59 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1727,6 +1727,16 @@ pathbias_send_usable_probe(circuit_t *circ) return -1; } + /* Can't probe if the channel isn't open */ + if (circ->n_chan == NULL || + (circ->n_chan->state != CHANNEL_STATE_OPEN + && circ->n_chan->state != CHANNEL_STATE_MAINT)) { + log_info(LD_CIRC, + "Skipping pathbias probe for circuit %d: Channel is not open.", + ocirc->global_identifier); + return -1; + } + circuit_change_purpose(circ, CIRCUIT_PURPOSE_PATH_BIAS_TESTING); /* Update timestamp for when circuit_expire_building() should kill us */

1 0

[tor/master] Merge branch 'bug7802' of ssh://git-rw.torproject.org/mikeperry/tor
by andrea＠torproject.org 29 Jan '13

29 Jan '13

commit 123daffb600cb1b581bee9dd576a980a06926f9c Merge: dfbd19d a78542f Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Jan 28 16:16:45 2013 -0800 Merge branch 'bug7802' of ssh://git-rw.torproject.org/mikeperry/tor changes/bug7802 | 11 + doc/tor.1.txt | 31 ++- src/or/circuitbuild.c | 618 +++++++++++++++++++++++++++++++++++++--------- src/or/circuitbuild.h | 3 + src/or/circuituse.c | 30 ++- src/or/config.c | 7 +- src/or/connection_edge.c | 28 ++- src/or/entrynodes.c | 48 ++++- src/or/entrynodes.h | 7 +- src/or/or.h | 32 ++- src/or/relay.c | 2 +- src/or/rendclient.c | 9 +- src/or/rendservice.c | 16 +- 13 files changed, 691 insertions(+), 151 deletions(-) diff --cc src/or/or.h index 251512d,409a603..cfcddba --- a/src/or/or.h +++ b/src/or/or.h @@@ -2998,11 -3013,8 +3014,10 @@@ typedef struct origin_circuit_t * ISO_STREAM. */ uint64_t associated_isolated_stream_global_id; /**@}*/ - } origin_circuit_t; +struct onion_queue_t; + /** An or_circuit_t holds information needed to implement a circuit at an * OR. */ typedef struct or_circuit_t {

1 0

[tor/master] Don't immediately count cannibalized circs as used.
by andrea＠torproject.org 29 Jan '13

29 Jan '13

commit a2db17a1aab77c4183f589815800a779a5f24524 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jan 18 19:34:01 2013 -0800 Don't immediately count cannibalized circs as used. Since they use RELAY_EARLY (which can be seen by all hops on the path), it's not safe to say they actually count as a successful use. There are also problems with trying to allow them to finish extending due to the circuit purpose state machine logic. It is way less complicated (and possibly more semantically coherent) to simply wait until we actually try to do something with them before claiming we 'used' them. Also, we shouldn't call timed out circuits 'used' either, for semantic consistency. --- src/or/circuitbuild.c | 7 +------ src/or/circuituse.c | 14 +------------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 435ccd9..8880f14 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -823,9 +823,6 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) /* We're done with measurement circuits here. Just close them */ if (circ->base_.purpose == CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT) { - /* If a measurement circ ever gets back to us, consider it - * succeeded for path bias */ - circ->path_state = PATH_STATE_USE_SUCCEEDED; circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_FINISHED); } return 0; @@ -3140,9 +3137,7 @@ circuit_extend_to_new_exit(origin_circuit_t *circ, extend_info_t *exit) return -1; } - /* Set timestamp_dirty, so we can check it for path use bias */ - if (!circ->base_.timestamp_dirty) - circ->base_.timestamp_dirty = time(NULL); + // XXX: Should cannibalized circuits be dirty or not? Not easy to say.. return 0; } diff --git a/src/or/circuituse.c b/src/or/circuituse.c index d0b1b49..0b2fe9e 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -668,18 +668,6 @@ circuit_expire_building(void) circuit_build_times_set_timeout(&circ_times); } } - - if (TO_ORIGIN_CIRCUIT(victim)->has_opened && - victim->purpose != CIRCUIT_PURPOSE_PATH_BIAS_TESTING) { - /* For path bias: we want to let these guys live for a while - * so we get a chance to test them. */ - log_info(LD_CIRC, - "Allowing cannibalized circuit %d time to finish building " - "as a pathbias testing circ.", - TO_ORIGIN_CIRCUIT(victim)->global_identifier); - circuit_change_purpose(victim, CIRCUIT_PURPOSE_PATH_BIAS_TESTING); - continue; /* It now should have a longer timeout next time */ - } } /* If this is a hidden service client circuit which is far enough @@ -1517,7 +1505,7 @@ circuit_launch_by_extend_info(uint8_t purpose, * If we decide to probe the initial portion of these circs, * (up to the adversaries final hop), we need to remove this. */ - circ->path_state = PATH_STATE_USE_SUCCEEDED; + /* This must be called before the purpose change */ pathbias_check_close(circ, END_CIRC_REASON_FINISHED); }

1 0