[tor-commits] [metrics-tasks/master] Add yet another graph (#15513).
commit 7822084eef8ba5ddc657b7fed420f208daef86ba Author: Karsten Loesing karsten.loes...@gmx.net Date: Wed Apr 22 16:27:05 2015 +0200 Add yet another graph (#15513). --- task-15513/plot.R| 11 task-15513/src/ParseDescriptors.java | 48 ++ 2 files changed, 59 insertions(+) diff --git a/task-15513/plot.R b/task-15513/plot.R index 26fc854..4f83c6d 100644 --- a/task-15513/plot.R +++ b/task-15513/plot.R @@ -92,3 +92,14 @@ ggplot(l, aes(x = as.POSIXct(publication, scale_y_continuous() + ggtitle(Number of introduction points over time\n) +l - read.csv(novel-introduction-points.csv) +ggplot(l, aes( + x = as.POSIXct(publication / 1000, origin = 1970-01-01 00:00:00), + y = distinctrelays, colour = service)) + + geom_line() + + scale_x_datetime() + + scale_y_continuous(Cumulative number of relays\n) + + scale_colour_hue(Service) + + ggtitle(paste(Cumulative number of distinct relays\nused for, +establishing introduction points\n)) + diff --git a/task-15513/src/ParseDescriptors.java b/task-15513/src/ParseDescriptors.java index ef4d77f..5ed2887 100644 --- a/task-15513/src/ParseDescriptors.java +++ b/task-15513/src/ParseDescriptors.java @@ -60,6 +60,10 @@ public class ParseDescriptors { writeIntroductionPointsPerRelay(parsedDescriptors, new File(intros-per-relay.csv), service,intros); + +writeNovelIntroductionPoints(parsedDescriptors, +new File(novel-introduction-points.csv), +service,publication,distinctrelays); } private static SortedMapString, SortedMapLong, ListSetString @@ -417,4 +421,48 @@ public class ParseDescriptors { } bw.close(); } + + private static void writeNovelIntroductionPoints(SortedMapString, + SortedMapLong, ListSetString parsedDescriptors, + File csvFile, String header) throws IOException { +SortedMapString, /* - service name */ +SortedMapLong, /* - publication time */ +Integer /* - distinct relays used for introduction points */ +novelIntroductionPoints = +new TreeMapString, SortedMapLong, Integer(); +for (Map.EntryString, SortedMapLong, ListSetString e0 : +parsedDescriptors.entrySet()) { + String serviceName = e0.getKey(); + SortedMapLong, Integer novelIntroductionPointsThisService = + new TreeMapLong, Integer(); + SetString relaysSeenSoFar = new HashSetString(); + for (Map.EntryLong, ListSetString e1 : + e0.getValue().entrySet()) { +long publicationTime = e1.getKey(); +for (SetString introductionPoints : e1.getValue()) { + for (String introductionPoint : introductionPoints) { +String[] parts = introductionPoint.split(-); +String fingerprint = parts[0]; +if (!relaysSeenSoFar.contains(fingerprint)) { + relaysSeenSoFar.add(fingerprint); + novelIntroductionPointsThisService.put( + publicationTime, relaysSeenSoFar.size()); +} + } +} + } + novelIntroductionPoints.put(serviceName, + novelIntroductionPointsThisService); +} +BufferedWriter bw = new BufferedWriter(new FileWriter(csvFile)); +bw.write(header + \n); +for (Map.EntryString, SortedMapLong, Integer e0 : +novelIntroductionPoints.entrySet()) { + for (Map.EntryLong, Integer e1 : e0.getValue().entrySet()) { +bw.write(e0.getKey() + , + e1.getKey() + , + e1.getValue() ++ \n); + } +} +bw.close(); + } } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Updates press.wml's articles.
commit c1c92c9210787e6b5564c9abadcb2714c74a6e34 Author: Sherief Alaa sheriefala...@gmail.com Date: Wed Apr 22 19:25:49 2015 +0200 Updates press.wml's articles. --- press/en/press.wml | 21 - 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/press/en/press.wml b/press/en/press.wml index 743d02b..e19cb9c 100644 --- a/press/en/press.wml +++ b/press/en/press.wml @@ -32,7 +32,26 @@ newest to oldest: /p thTopic/th /tr /thead - +tr style=background-color: #e5e5e5; +td2015 April 9/td +tdSilicon Republic/td +tda href=http://www.siliconrepublic.com/enterprise/item/41531-the-interview-runa-sandvik;Interview with Runa Sandvik/a/td +/tr +tr style= +td2015 April 4/td +tdEl Pais/td +tda href=http://tecnologia.elpais.com/tecnologia/2015/04/04/actualidad/1428169979_196077.html Hay que lograr que Internet deje de ser un medio de vigilancia masiva /a/td +/tr +tr style=background-color: #e5e5e5; +td2015 April 2/td +tdMotherboard /td +tda href=http://motherboard.vice.com/read/tor-wants-to-know-how-to-make-the-darknet-mainstream;Tor wants to know how to make the darknet mainstream/a/td +/tr +tr style= +td2015 March 26/td +tdDaily Dot/td +tda href=http://www.dailydot.com/politics/tor-media-public-relations-perception/;Tor's great rebranding/a/td +/tr tr style=background-color: #e5e5e5; td2015 Mar 22/td tdThe Hill/td ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor_animation] Update translations for tor_animation
commit 4ba32a5edaa30a5dbb70daf78d96b9da35066655 Author: Translation commit bot translat...@torproject.org Date: Wed Apr 22 18:45:54 2015 + Update translations for tor_animation --- lv.srt | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lv.srt b/lv.srt index c8c78bc..783b6ca 100644 --- a/lv.srt +++ b/lv.srt @@ -55,42 +55,42 @@ TaÄu ne tad, ja izmantojat Tor! 13 00:00:37,140 -- 00:00:40,840 -Tor Browser protects our privacy -and identity on the Internet. +Tor pÄrlÅ«ks aizsargÄ mÅ«su privÄtumu + un identitÄti internetÄ. 14 00:00:41,560 -- 00:00:44,760 -Tor secures your connection -with three layers of encryption +Tor nodroÅ¡ina jÅ«su savienojumu +ar trÄ«s dažÄdiem Å¡ifriem 15 00:00:44,940 -- 00:00:49,760 -and passes it through three voluntarily -operated servers around the world, +un izlaiž cauri trÄ«s brÄ«vprÄtÄ«gi +strÄdÄjoÅ¡iem serveriem pasaulÄ, 16 00:00:50,280 -- 00:00:53,520 -which enables us to communicate -anonymously over the Internet. +kas atļauj mums komunicÄt +internetÄ anonÄ«mi. 17 00:00:56,560 -- 00:00:58,280 -Tor also protects our data +Tor arÄ« aizsargÄ mÅ«su datus 18 00:00:58,400 -- 00:01:01,900 -against corporate or government targeted -and mass surveillance. +pret korporatÄ«vo vai valdÄ«bas mÄrÄ·Äto +un masu uzraudzÄ«bu. 19 00:01:02,880 -- 00:01:07,340 -Perhaps you live in a repressive country -which tries to control and surveil the Internet. +IespÄjams, jÅ«s dzÄ«vojat represÄ«vÄ valstÄ«, +kas cenÅ¡as konrolÄt un uzraudzÄ«t internetu. 20 00:01:07,900 -- 00:01:11,800 -Or perhaps you don't want big corporations -taking advantage of your personal information. +Vai arÄ« iespÄjams, ka jÅ«s nevÄlaties, lai lielas korporÄcijas +gÅ«tu labumu no jÅ«su personÄ«gÄs informÄcijas. 21 00:01:12,880 -- 00:01:15,640 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
commit b43e84cbb130d9a53ee58d914894987f63151dbe Author: Translation commit bot translat...@torproject.org Date: Wed Apr 22 19:45:51 2015 + Update translations for torbutton-torbuttonproperties --- pl/torbutton.properties |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pl/torbutton.properties b/pl/torbutton.properties index 4846677..e5b398c 100644 --- a/pl/torbutton.properties +++ b/pl/torbutton.properties @@ -55,10 +55,10 @@ torbutton.popup.confirm_plugins = Wtyczki takie jak Flash mogÄ szkodziÄ Twojej torbutton.popup.never_ask_again = Nie pytaj mnie wiÄcej torbutton.popup.confirm_newnym = Tor Browser zamknie wszystkie otwarte okna i karty. Wszystkie sesje zostanÄ utracone.\n\nCzy chcesz zrestartowaÄ Tor Browser teraz, aby zmieniÄ tożsamoÅÄ?\n\n -torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification = Zielone menu w ksztaÅcie cebuli ma suwak który pozwoli wybraÄ poziom bezpieczeÅstwa. Sprawdź i wypróbuj! +torbutton.slider_notification_button = Otwórz ustawienia bezpieczeÅstwa -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = ZwiÄkszenie przeglÄ darki Tor pozwala stronom internetowym ustaliÄ rozmiar ekranu i przez to ÅledziÄ użytkownika. Polecamy zostawiaÄ przeglÄ darka Tor w domyÅlnym rozmiarze. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Ta strona internetowa (%S) próbowaÅa wydobyÄ HTML5 canvas danych obrazu, które mogÄ byÄ wykorzystane w celu identyfikacji Twojego komputera.\n\nCzy chcesz, aby Tor Browser pozwoliÅ tej stronie na wydobycie danych obrazu HTML5 canvas? ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor_animation] Update translations for tor_animation
commit 5ccfc71c013900f7db11ad10f991dd57e297540b Author: Translation commit bot translat...@torproject.org Date: Wed Apr 22 19:16:06 2015 + Update translations for tor_animation --- lv.srt | 50 +- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/lv.srt b/lv.srt index 783b6ca..5e69b08 100644 --- a/lv.srt +++ b/lv.srt @@ -94,70 +94,70 @@ gÅ«tu labumu no jÅ«su personÄ«gÄs informÄcijas. 21 00:01:12,880 -- 00:01:15,640 -Tor makes all of its users -to look the same +Tor padara visus tÄ lietotÄjus +izskatÄ«ties vienÄdiem, 22 00:01:15,920 -- 00:01:18,800 -which confuses the observer -and makes you anonymous. +kas apmulsina novÄrotÄju +un padara JÅ«s anonÄ«mus. 23 00:01:19,500 -- 00:01:22,980 -So, the more people use the Tor network, -the stronger it gets +TÄtad, jo vairÄk cilvÄku lieto Tor tÄ«klu, +jo stiprÄks tas kļūst 24 00:01:23,140 -- 00:01:27,800 -as it's easier to hide in a crowd -of people who look exactly the same. +un ir vieglÄk paslÄpties pÅ«lÄ«, +kur visi cilvÄki izskatÄs pilnÄ«gi vienÄdi. 25 00:01:28,700 -- 00:01:31,240 -You can bypass the censorship -without being worried about +JÅ«s variet izvairÄ«ties no cenzÅ«ras +bez uztraukÅ¡anÄs par 26 00:01:31,400 -- 00:01:34,100 -the censor knowing what you do -on the Internet. +cenzora zinÄÅ¡anu, ko JÅ«s darÄt +internetÄ. 27 00:01:36,540 -- 00:01:39,440 -The ads won't follow you -everywhere for months, +ReklÄmas Jums visur nesekos +mÄneÅ¡iem ilgi, 28 00:01:39,640 -- 00:01:41,300 -starting when you first -clicked on a product. +sÄkot no brīža, kad JÅ«s pirmoreiz +uzklikÅ¡Ä·inÄjÄt uz produktu. 29 00:01:43,880 -- 00:01:47,380 -By using Tor, the sites you visit -won't even know who you are, +Lietojot Tor, mÄjaslapas, kuras JÅ«s apmeklÄjat +pat nezina, kas JÅ«s esat, 30 00:01:47,540 -- 00:01:49,760 -from what part of the world -you're visiting them, +no kuras pasaules daļas +JÅ«s to apmeklÄjat, 31 00:01:49,920 -- 00:01:51,920 -unless you login and tell them so. +ja vien JÅ«s nepierakstÄ«sities un par to nepastÄstÄ«siet. 32 00:01:54,200 -- 00:01:55,840 -By downloading and using Tor, +LejupielÄdÄjot un lietojot Tor, 33 00:01:56,200 -- 00:01:58,560 -you can protect the people -who need anonymity, +JÅ«s varat aizsargÄt cilvÄkus, +kuriem anonimitÄte ir nepiecieÅ¡ama, 34 00:01:58,880 -- 00:02:01,640 -like activists, journalists and bloggers. +kÄ piemÄram, žurnÄlistus un blogerus. 35 00:02:02,000 -- 00:02:07,000 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor_animation_completed] Update translations for tor_animation_completed
commit 11969973dea63e2a8605cb17da521e69fe980119 Author: Translation commit bot translat...@torproject.org Date: Wed Apr 22 19:16:10 2015 + Update translations for tor_animation_completed --- lv.srt | 165 1 file changed, 165 insertions(+) diff --git a/lv.srt b/lv.srt new file mode 100644 index 000..5e69b08 --- /dev/null +++ b/lv.srt @@ -0,0 +1,165 @@ +1 +00:00:00,660 -- 00:00:02,780 +MÄs esam ļoti pieraduÅ¡i pie interneta. + +2 +00:00:03,120 -- 00:00:07,700 +MÄs nepÄrtraukti dalÄmies ar informÄciju +par sevi un savu privÄto dzÄ«vi: + +3 +00:00:08,000 -- 00:00:09,960 +Ädienu, ko Ädam, cilvÄkiem, kurus satiekam, + +4 +00:00:10,180 -- 00:00:12,480 +vietÄm, uz kurÄm dodamies, un arÄ« to, ko lasÄm. + +5 +00:00:13,280 -- 00:00:14,640 +Ä»aujiet man paskaidrot labÄk. + +6 +00:00:14,920 -- 00:00:17,740 +TieÅ¡i Å¡obrÄ«d, +ja kÄds centÄ«sies JÅ«s atrast, + +7 +00:00:18,060 -- 00:00:22,480 +Å¡Ä« persona noskaidros JÅ«su patiesu identitÄti, +precÄ«zu atraÅ¡anÄs vietu, operÄtÄjsistÄmu, + +8 +00:00:22,800 -- 00:00:26,500 +visas JÅ«su apmeklÄtÄs tÄ«mekļa vietnes, +tÄ«mekļa pÄrlÅ«koÅ¡anai izmantoto pÄrlÅ«ku, + +9 +00:00:26,700 -- 00:00:29,140 +un tik daudz vairÄk informÄcijas +par Jums un JÅ«su dzÄ«vi + +10 +00:00:29,200 -- 00:00:31,500 +cik, ticami, JÅ«s nebijÄt domÄjis +kopÄ«got ar nezinÄmiem sveÅ¡iniekiem, + +11 +00:00:31,700 -- 00:00:34,000 +kas var viegli izmantot Å¡os datus +pret Jums. + +12 +00:00:34,500 -- 00:00:37,000 +TaÄu ne tad, ja izmantojat Tor! + +13 +00:00:37,140 -- 00:00:40,840 +Tor pÄrlÅ«ks aizsargÄ mÅ«su privÄtumu + un identitÄti internetÄ. + +14 +00:00:41,560 -- 00:00:44,760 +Tor nodroÅ¡ina jÅ«su savienojumu +ar trÄ«s dažÄdiem Å¡ifriem + +15 +00:00:44,940 -- 00:00:49,760 +un izlaiž cauri trÄ«s brÄ«vprÄtÄ«gi +strÄdÄjoÅ¡iem serveriem pasaulÄ, + +16 +00:00:50,280 -- 00:00:53,520 +kas atļauj mums komunicÄt +internetÄ anonÄ«mi. + +17 +00:00:56,560 -- 00:00:58,280 +Tor arÄ« aizsargÄ mÅ«su datus + +18 +00:00:58,400 -- 00:01:01,900 +pret korporatÄ«vo vai valdÄ«bas mÄrÄ·Äto +un masu uzraudzÄ«bu. + +19 +00:01:02,880 -- 00:01:07,340 +IespÄjams, jÅ«s dzÄ«vojat represÄ«vÄ valstÄ«, +kas cenÅ¡as konrolÄt un uzraudzÄ«t internetu. + +20 +00:01:07,900 -- 00:01:11,800 +Vai arÄ« iespÄjams, ka jÅ«s nevÄlaties, lai lielas korporÄcijas +gÅ«tu labumu no jÅ«su personÄ«gÄs informÄcijas. + +21 +00:01:12,880 -- 00:01:15,640 +Tor padara visus tÄ lietotÄjus +izskatÄ«ties vienÄdiem, + +22 +00:01:15,920 -- 00:01:18,800 +kas apmulsina novÄrotÄju +un padara JÅ«s anonÄ«mus. + +23 +00:01:19,500 -- 00:01:22,980 +TÄtad, jo vairÄk cilvÄku lieto Tor tÄ«klu, +jo stiprÄks tas kļūst + +24 +00:01:23,140 -- 00:01:27,800 +un ir vieglÄk paslÄpties pÅ«lÄ«, +kur visi cilvÄki izskatÄs pilnÄ«gi vienÄdi. + +25 +00:01:28,700 -- 00:01:31,240 +JÅ«s variet izvairÄ«ties no cenzÅ«ras +bez uztraukÅ¡anÄs par + +26 +00:01:31,400 -- 00:01:34,100 +cenzora zinÄÅ¡anu, ko JÅ«s darÄt +internetÄ. + +27 +00:01:36,540 -- 00:01:39,440 +ReklÄmas Jums visur nesekos +mÄneÅ¡iem ilgi, + +28 +00:01:39,640 -- 00:01:41,300 +sÄkot no brīža, kad JÅ«s pirmoreiz +uzklikÅ¡Ä·inÄjÄt uz produktu. + +29 +00:01:43,880 -- 00:01:47,380 +Lietojot Tor, mÄjaslapas, kuras JÅ«s apmeklÄjat +pat nezina, kas JÅ«s esat, + +30 +00:01:47,540 -- 00:01:49,760 +no kuras pasaules daļas +JÅ«s to apmeklÄjat, + +31 +00:01:49,920 -- 00:01:51,920 +ja vien JÅ«s nepierakstÄ«sities un par to nepastÄstÄ«siet. + +32 +00:01:54,200 -- 00:01:55,840 +LejupielÄdÄjot un lietojot Tor, + +33 +00:01:56,200 -- 00:01:58,560 +JÅ«s varat aizsargÄt cilvÄkus, +kuriem anonimitÄte ir nepiecieÅ¡ama, + +34 +00:01:58,880 -- 00:02:01,640 +kÄ piemÄram, žurnÄlistus un blogerus. + +35 +00:02:02,000 -- 00:02:07,000 +LejuplÄdÄjiet un izmantojiet Tor! Vai darbiniet retranslatoru! + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] Update translations for bridgedb
commit eef98d999222c6d2b4308a015fa5278083d39eeb Author: Translation commit bot translat...@torproject.org Date: Wed Apr 22 19:45:03 2015 + Update translations for bridgedb --- pl/LC_MESSAGES/bridgedb.po |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pl/LC_MESSAGES/bridgedb.po b/pl/LC_MESSAGES/bridgedb.po index 6ebe4ba..d0b4424 100644 --- a/pl/LC_MESSAGES/bridgedb.po +++ b/pl/LC_MESSAGES/bridgedb.po @@ -9,6 +9,7 @@ # bogdrozd bo...@gazeta.pl, 2013 # Dawid h...@hoek.pl, 2014 # Rikson e...@mail2tor.com, 2014 +# Karol Obartuch kobart...@luc.edu, 2015 # Krzysztof Åojowski maxxxra...@gmail.com, 2014 # oirpos kuba2...@gmail.com, 2015 # seb, 2014-2015 @@ -16,8 +17,8 @@ msgid msgstr Project-Id-Version: The Tor Project\n Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'POT-Creation-Date: 2015-03-19 22:13+\n -PO-Revision-Date: 2015-04-19 08:23+\n -Last-Translator: runasand runa.sand...@gmail.com\n +PO-Revision-Date: 2015-04-22 19:41+\n +Last-Translator: Karol Obartuch kobart...@luc.edu\n Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -211,7 +212,7 @@ msgid To enter bridges into Tor Browser, first go to the %s Tor Browser download\n page %s and then follow the instructions there for downloading and starting\n Tor Browser. -msgstr +msgstr Aby wprowadziÄ mosty do Tor Browser, postÄpuj zgodnie z instrukcjami na %s stronie \npobierania Tor Browser %s, aby uruchomiÄ Tor Browser. #. TRANSLATORS: Please DO NOT translate Tor. #: lib/bridgedb/strings.py:126 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed
commit b7dcdf24fa07384df16609579adfe94e0c17f9e4 Author: Translation commit bot translat...@torproject.org Date: Wed Apr 22 19:45:07 2015 + Update translations for bridgedb_completed --- pl/LC_MESSAGES/bridgedb.po | 33 + 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/pl/LC_MESSAGES/bridgedb.po b/pl/LC_MESSAGES/bridgedb.po index 8f938cf..d0b4424 100644 --- a/pl/LC_MESSAGES/bridgedb.po +++ b/pl/LC_MESSAGES/bridgedb.po @@ -9,16 +9,16 @@ # bogdrozd bo...@gazeta.pl, 2013 # Dawid h...@hoek.pl, 2014 # Rikson e...@mail2tor.com, 2014 +# Karol Obartuch kobart...@luc.edu, 2015 # Krzysztof Åojowski maxxxra...@gmail.com, 2014 # oirpos kuba2...@gmail.com, 2015 # seb, 2014-2015 msgid msgstr Project-Id-Version: The Tor Project\n -Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n -POT-Creation-Date: 2015-02-03 03:24+\n -PO-Revision-Date: 2015-02-14 10:50+\n -Last-Translator: seb\n +Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'POT-Creation-Date: 2015-03-19 22:13+\n +PO-Revision-Date: 2015-04-22 19:41+\n +Last-Translator: Karol Obartuch kobart...@luc.edu\n Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -38,7 +38,7 @@ msgstr #. fteproxy #. Tor #. Tor Browser -#: lib/bridgedb/HTTPServer.py:122 +#: lib/bridgedb/HTTPServer.py:107 msgid Sorry! Something went wrong with your request. msgstr Przepraszamy! Ale coÅ poszÅo nie tak z Twoim zapytaniem. @@ -209,26 +209,27 @@ msgstr Jak zaczÄ Ä używaÄ mostów #: lib/bridgedb/strings.py:121 #, python-format msgid -To enter bridges into Tor Browser, follow the instructions on the %s Tor\n -Browser download page %s to start Tor Browser. -msgstr Aby dodaÄ mosty do Tor Browser, postÄpuj zgodnie z instrukcjami dostÄpnymi na %s stronie \npobierania Tor Browser %s w celu uruchomienia Tor Browser. +To enter bridges into Tor Browser, first go to the %s Tor Browser download\n +page %s and then follow the instructions there for downloading and starting\n +Tor Browser. +msgstr Aby wprowadziÄ mosty do Tor Browser, postÄpuj zgodnie z instrukcjami na %s stronie \npobierania Tor Browser %s, aby uruchomiÄ Tor Browser. #. TRANSLATORS: Please DO NOT translate Tor. -#: lib/bridgedb/strings.py:125 +#: lib/bridgedb/strings.py:126 msgid When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n the wizard until it asks: msgstr Po pojawieniu siÄ okna 'Ustawienia Sieci Tor' naciÅnij przycisk \Konfiguruj\, a nastÄpnie postÄpuj zgodnie ze\nwskazówkami kreatora do momentu pytania o: #. TRANSLATORS: Please DO NOT translate Tor. -#: lib/bridgedb/strings.py:129 +#: lib/bridgedb/strings.py:130 msgid Does your Internet Service Provider (ISP) block or otherwise censor connections\n to the Tor network? msgstr Czy Twój dostawca usÅug internetowych (ISP) blokuje lub cenzuruje poÅÄ czenia do sieci Tor? #. TRANSLATORS: Please DO NOT translate Tor. -#: lib/bridgedb/strings.py:133 +#: lib/bridgedb/strings.py:134 msgid Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n paste the bridge lines into the text input box. Finally, click 'Connect', and\n @@ -236,29 +237,29 @@ msgid button in the 'Tor Network Settings' wizard for further assistance. msgstr Wybierz 'Tak' a nastÄpnie kliknij 'Dalej'. Aby skonfigurowaÄ swoje nowe \nmosty, skopiuj i wklej każdy most w nowym wierszu w polu tekstowym. \nNa koniec kliknij 'PoÅÄ cz' i to wszystko! JeÅli napotkasz jakiekolwiek problemy, naciÅnij przycisk 'Pomoc' w kreatorze 'Ustawienia Sieci Tor' w celu uzyskania dalszych porad. -#: lib/bridgedb/strings.py:141 +#: lib/bridgedb/strings.py:142 msgid Displays this message. msgstr WyÅwietla tÄ wiadomoÅÄ. #. TRANSLATORS: Please try to make it clear that vanilla here refers to the #. same non-Pluggable Transport bridges described above as being #. plain-ol'-vanilla bridges. -#: lib/bridgedb/strings.py:145 +#: lib/bridgedb/strings.py:146 msgid Request vanilla bridges. msgstr PoproÅ o regularne mosty. -#: lib/bridgedb/strings.py:146 +#: lib/bridgedb/strings.py:147 msgid Request IPv6 bridges. msgstr PoproÅ o mosty IPv6. #. TRANSLATORS: Please DO NOT translate the word the word TYPE. -#: lib/bridgedb/strings.py:148 +#: lib/bridgedb/strings.py:149 msgid Request a Pluggable Transport by TYPE. msgstr PoproÅ o Pluggable Transport przez TYPE. #. TRANSLATORS: Please DO NOT translate BridgeDB. #. TRANSLATORS: Please DO NOT translate GnuPG. -#: lib/bridgedb/strings.py:151 +#: lib/bridgedb/strings.py:152 msgid Get a copy of BridgeDB's public GnuPG key. msgstr Uzyskaj kopiÄ klucza publicznego GnuPG BridgeDB.
[tor-commits] [obfs4/master] Bump the version to 0.0.6-dev, signifying development towards 0.0.6.
commit 37a709d8b4fec837c0c88c495e7ea926953d974f Author: Yawning Angel yawn...@torproject.org Date: Thu Apr 23 00:32:25 2015 + Bump the version to 0.0.6-dev, signifying development towards 0.0.6. --- ChangeLog|2 ++ obfs4proxy/obfs4proxy.go |2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3569518..15de989 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +Changes in version 0.0.6 - UNRELEASED: + Changes in version 0.0.5 - 2015-04-15: - Go vet/fmt fixes, and misc. code cleanups. Patches by mvdan. - Changed the go.net import path to the new location (golang.org/x/net). diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go index 5d13b32..5f7f171 100644 --- a/obfs4proxy/obfs4proxy.go +++ b/obfs4proxy/obfs4proxy.go @@ -51,7 +51,7 @@ import ( ) const ( - obfs4proxyVersion = 0.0.5 + obfs4proxyVersion = 0.0.6-dev obfs4proxyLogFile = obfs4proxy.log socksAddr = 127.0.0.1:0 ) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed
commit 14ad745b0b78e684893f0e6e0855ba4c150210e7 Author: Translation commit bot translat...@torproject.org Date: Wed Apr 22 20:45:07 2015 + Update translations for bridgedb_completed --- fa/LC_MESSAGES/bridgedb.po | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/fa/LC_MESSAGES/bridgedb.po b/fa/LC_MESSAGES/bridgedb.po index 5e9ebc8..14e1834 100644 --- a/fa/LC_MESSAGES/bridgedb.po +++ b/fa/LC_MESSAGES/bridgedb.po @@ -14,9 +14,8 @@ msgid msgstr Project-Id-Version: The Tor Project\n -Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n -POT-Creation-Date: 2015-02-03 03:24+\n -PO-Revision-Date: 2015-02-17 22:11+\n +Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'POT-Creation-Date: 2015-03-19 22:13+\n +PO-Revision-Date: 2015-04-22 20:42+\n Last-Translator: Gilberto\n Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n MIME-Version: 1.0\n @@ -37,7 +36,7 @@ msgstr #. fteproxy #. Tor #. Tor Browser -#: lib/bridgedb/HTTPServer.py:122 +#: lib/bridgedb/HTTPServer.py:107 msgid Sorry! Something went wrong with your request. msgstr ٠تاس٠ÙستÛÙ Ø Ø¯Ø± رابط٠با درخÙاست ش٠ا خطاÛÛ Ø±Ø® داد٠است. @@ -208,26 +207,27 @@ msgstr ÚÚ¯ÙÙÚ¯Û Ø§Ø² Ù¾ÙâÙØ§Û Ø®Ùد استÙاد٠کÙÛد #: lib/bridgedb/strings.py:121 #, python-format msgid -To enter bridges into Tor Browser, follow the instructions on the %s Tor\n -Browser download page %s to start Tor Browser. -msgstr Ø¨Ø±Ø§Û Ùارد کرد٠پ٠Ùا در Tor Browser, دÙبا٠کÙÛد دستÙراÙع٠٠را در %s Tor\nBrowser صÙØ٠داÙÙÙد %s Ø¨Ø±Ø§Û Ø´Ø±Ùع Tor Browser. +To enter bridges into Tor Browser, first go to the %s Tor Browser download\n +page %s and then follow the instructions there for downloading and starting\n +Tor Browser. +msgstr Ø¨Ø±Ø§Û ÙرÙد ب٠پ٠در ٠رÙرگر Tor Ø Ø¨Ø±Ø§Û Ø§ÙÙÛ٠بار %s ب٠داÙÙÙد ٠رÙرگر Tor \nصÙØÙ %s ٠پس از آ٠ب٠دÙبا٠دستÙراÙع٠٠داÙÙÙد ٠استÙاد٠از\n٠رÙرگر Tor برÙÛد. #. TRANSLATORS: Please DO NOT translate Tor. -#: lib/bridgedb/strings.py:125 +#: lib/bridgedb/strings.py:126 msgid When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n the wizard until it asks: msgstr ÙÙØªÛ Ú©Ù ØµÙØÙ 'تÙظÛ٠ات شبک٠تÙر' Ù٠اÛØ´ داد٠شد, رÙÛ Ú¯Ø²ÛÙÙ 'Ù¾ÛکربÙدÛ' Ú©ÙÛÚ© Ú©ÙÛد ٠دÙبا٠کÙÛد\nتا ز٠اÙÛ Ú©Ù wizard از ش٠ا بپرسد: #. TRANSLATORS: Please DO NOT translate Tor. -#: lib/bridgedb/strings.py:129 +#: lib/bridgedb/strings.py:130 msgid Does your Internet Service Provider (ISP) block or otherwise censor connections\n to the Tor network? msgstr Ø¢Ûا شرکت اراÛ٠دÙÙد٠اÛÙترÙت (ISP) ش٠ا بÙاک Ù Û Ú©Ùد Ù Ûا ساÙسÙر Ù Û Ú©Ùد ارتباطات\nشبک٠تÙر ش٠ا Ø±Ø§Ø #. TRANSLATORS: Please DO NOT translate Tor. -#: lib/bridgedb/strings.py:133 +#: lib/bridgedb/strings.py:134 msgid Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n paste the bridge lines into the text input box. Finally, click 'Connect', and\n @@ -235,29 +235,29 @@ msgid button in the 'Tor Network Settings' wizard for further assistance. msgstr 'بÙÙ' را اÙتخاب کرد٠٠سپس 'بعدÛ' را اÙتخاب Ú©ÙÛد. Ø¨Ø±Ø§Û Ù¾ÛکربÙØ¯Û Ù¾Ù Ø¬Ø¯Ûد Ø®Ùد, copy Ù paste Ú©ÙÛد خطÙØ· پ٠را در ٠ت٠جعب٠ÙرÙدÛ. در ÙÙاÛت, رÙÛ 'اتصاÙ' Ú©ÙÛÚ© Ú©ÙÛد,\nرا٠درستش اÛ٠است! اگر Ù Ø´Ú©ÙÛ Ù¾ÛØ´ آ٠د, Ú©ÙÛÚ© Ú©ÙÛد رÙÛ Ú©ÙÛد 'راÙÙ٠ا'\nدر 'تÙظÛ٠ات شبک٠تÙر' wizard Ø¨Ø±Ø§Û Ø§Ø·Ùاعات بÛشتر. -#: lib/bridgedb/strings.py:141 +#: lib/bridgedb/strings.py:142 msgid Displays this message. msgstr اÛÙ Ù¾Ûا٠را Ù٠اÛØ´ Ù Û Ø¯Ùد. #. TRANSLATORS: Please try to make it clear that vanilla here refers to the #. same non-Pluggable Transport bridges described above as being #. plain-ol'-vanilla bridges. -#: lib/bridgedb/strings.py:145 +#: lib/bridgedb/strings.py:146 msgid Request vanilla bridges. msgstr درخÙاست Ù¾ÙâÙØ§Û Ø¹Ø§Ø¯Û -#: lib/bridgedb/strings.py:146 +#: lib/bridgedb/strings.py:147 msgid Request IPv6 bridges. msgstr درخÙاست Ù¾ÙâÙØ§Û IPv6 #. TRANSLATORS: Please DO NOT translate the word the word TYPE. -#: lib/bridgedb/strings.py:148 +#: lib/bridgedb/strings.py:149 msgid Request a Pluggable Transport by TYPE. msgstr درخÙاست ÛÚ© رÙØ´ Transport جاÛگزÛ٠براساس TYPE #. TRANSLATORS: Please DO NOT translate BridgeDB. #.
[tor-commits] [translation/bridgedb] Update translations for bridgedb
commit a623f1099e1d58e977ec470be1414a9945c791bf Author: Translation commit bot translat...@torproject.org Date: Wed Apr 22 20:45:03 2015 + Update translations for bridgedb --- fa/LC_MESSAGES/bridgedb.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fa/LC_MESSAGES/bridgedb.po b/fa/LC_MESSAGES/bridgedb.po index a4c7fe5..14e1834 100644 --- a/fa/LC_MESSAGES/bridgedb.po +++ b/fa/LC_MESSAGES/bridgedb.po @@ -15,8 +15,8 @@ msgid msgstr Project-Id-Version: The Tor Project\n Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'POT-Creation-Date: 2015-03-19 22:13+\n -PO-Revision-Date: 2015-04-19 08:23+\n -Last-Translator: runasand runa.sand...@gmail.com\n +PO-Revision-Date: 2015-04-22 20:42+\n +Last-Translator: Gilberto\n Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -210,7 +210,7 @@ msgid To enter bridges into Tor Browser, first go to the %s Tor Browser download\n page %s and then follow the instructions there for downloading and starting\n Tor Browser. -msgstr +msgstr Ø¨Ø±Ø§Û ÙرÙد ب٠پ٠در ٠رÙرگر Tor Ø Ø¨Ø±Ø§Û Ø§ÙÙÛ٠بار %s ب٠داÙÙÙد ٠رÙرگر Tor \nصÙØÙ %s ٠پس از آ٠ب٠دÙبا٠دستÙراÙع٠٠داÙÙÙد ٠استÙاد٠از\n٠رÙرگر Tor برÙÛد. #. TRANSLATORS: Please DO NOT translate Tor. #: lib/bridgedb/strings.py:126 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] Update binutils to version 2.25
commit a467d500ac065d9b66b474be201472d423143133 Author: Nicolas Vigier bo...@torproject.org Date: Thu Apr 23 01:22:37 2015 +0200 Update binutils to version 2.25 --- projects/binutils/config|2 +- projects/binutils/enable-reloc-section-ld.patch | 48 +++ projects/binutils/peXXigen.patch|2 +- 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/projects/binutils/config b/projects/binutils/config index 9fe26ea..caa0514 100644 --- a/projects/binutils/config +++ b/projects/binutils/config @@ -1,5 +1,5 @@ # vim: filetype=yaml -version: 2.24 +version: 2.25 filename: '[% project %]-[% c(version) %]-[% c(var/build_id) %].tar.gz' remote_docker: 1 lsb_release: diff --git a/projects/binutils/enable-reloc-section-ld.patch b/projects/binutils/enable-reloc-section-ld.patch index f393f51..15ab4d8 100644 --- a/projects/binutils/enable-reloc-section-ld.patch +++ b/projects/binutils/enable-reloc-section-ld.patch @@ -1,10 +1,9 @@ -From 093b08a9e7af23a258306b710ebc4556d12f94f7 Mon Sep 17 00:00:00 2001 +From 6ef8bae3d2a4f4704c4a32f786c9574db3e70f25 Mon Sep 17 00:00:00 2001 From: Erinn Clark er...@torproject.org Date: Fri, 8 Aug 2014 14:23:44 -0400 Subject: [PATCH] add relocation section so Windows bundles can have ASLR Patch by skruffy. - --- ld/emultempl/pe.em | 6 + ld/emultempl/pep.em | 8 ++- @@ -13,18 +12,18 @@ Patch by skruffy. 4 files changed, 50 insertions(+), 28 deletions(-) diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em -index 5d6da9e..14c07f7 100644 +index 979cc8b8e960..4a63863289c8 100644 --- a/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em -@@ -268,6 +268,7 @@ fragment EOF - #define OPTION_TERMINAL_SERVER_AWARE (OPTION_WDM_DRIVER + 1) - /* Determinism. */ +@@ -274,6 +274,7 @@ fragment EOF #define OPTION_INSERT_TIMESTAMP (OPTION_TERMINAL_SERVER_AWARE + 1) -+#define OPTION_ENABLE_RELOC_SECTION (OPTION_INSERT_TIMESTAMP + 1) + #define OPTION_NO_INSERT_TIMESTAMP(OPTION_INSERT_TIMESTAMP + 1) + #define OPTION_BUILD_ID (OPTION_NO_INSERT_TIMESTAMP + 1) ++#define OPTION_ENABLE_RELOC_SECTION (OPTION_BUILD_ID + 1) static void gld${EMULATION_NAME}_add_options -@@ -310,6 +311,7 @@ gld${EMULATION_NAME}_add_options +@@ -317,6 +318,7 @@ gld${EMULATION_NAME}_add_options {export-all-symbols, no_argument, NULL, OPTION_EXPORT_ALL}, {exclude-symbols, required_argument, NULL, OPTION_EXCLUDE_SYMBOLS}, {exclude-all-symbols, no_argument, NULL, OPTION_EXCLUDE_ALL_SYMBOLS}, @@ -32,7 +31,7 @@ index 5d6da9e..14c07f7 100644 {exclude-libs, required_argument, NULL, OPTION_EXCLUDE_LIBS}, {exclude-modules-for-implib, required_argument, NULL, OPTION_EXCLUDE_MODULES_FOR_IMPLIB}, {kill-at, no_argument, NULL, OPTION_KILL_ATS}, -@@ -773,6 +775,9 @@ gld${EMULATION_NAME}_handle_option (int optc) +@@ -787,6 +789,9 @@ gld${EMULATION_NAME}_handle_option (int optc) case OPTION_EXCLUDE_ALL_SYMBOLS: pe_dll_exclude_all_symbols = 1; break; @@ -42,7 +41,7 @@ index 5d6da9e..14c07f7 100644 case OPTION_EXCLUDE_LIBS: pe_dll_add_excludes (optarg, EXCLUDELIBS); break; -@@ -1839,6 +1844,7 @@ gld_${EMULATION_NAME}_finish (void) +@@ -2059,6 +2064,7 @@ gld_${EMULATION_NAME}_finish (void) if (link_info.shared #if !defined(TARGET_IS_shpe) || (!link_info.relocatable pe_def_file-num_exports != 0) @@ -51,20 +50,20 @@ index 5d6da9e..14c07f7 100644 ) { diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em -index b738800..b566903 100644 +index b24a60820237..caf294663a80 100644 --- a/ld/emultempl/pep.em +++ b/ld/emultempl/pep.em -@@ -242,7 +242,8 @@ enum options - OPTION_NO_BIND, - OPTION_WDM_DRIVER, +@@ -248,7 +248,8 @@ enum options OPTION_INSERT_TIMESTAMP, -- OPTION_TERMINAL_SERVER_AWARE -+ OPTION_TERMINAL_SERVER_AWARE, + OPTION_NO_INSERT_TIMESTAMP, + OPTION_TERMINAL_SERVER_AWARE, +- OPTION_BUILD_ID ++ OPTION_BUILD_ID, + OPTION_ENABLE_RELOC_SECTION }; static void -@@ -284,6 +285,7 @@ gld${EMULATION_NAME}_add_options +@@ -290,6 +291,7 @@ gld${EMULATION_NAME}_add_options {export-all-symbols, no_argument, NULL, OPTION_EXPORT_ALL}, {exclude-symbols, required_argument, NULL, OPTION_EXCLUDE_SYMBOLS}, {exclude-all-symbols, no_argument, NULL, OPTION_EXCLUDE_ALL_SYMBOLS}, @@ -72,7 +71,7 @@ index b738800..b566903 100644 {exclude-libs, required_argument, NULL, OPTION_EXCLUDE_LIBS}, {exclude-modules-for-implib, required_argument, NULL, OPTION_EXCLUDE_MODULES_FOR_IMPLIB}, {kill-at, no_argument, NULL, OPTION_KILL_ATS}, -@@ -727,6 +729,9 @@ gld${EMULATION_NAME}_handle_option (int optc) +@@ -743,6 +745,9 @@ gld${EMULATION_NAME}_handle_option (int optc) case OPTION_EXCLUDE_ALL_SYMBOLS: pep_dll_exclude_all_symbols = 1; break; @@ -82,7 +81,7 @@ index b738800..b566903 100644 case OPTION_EXCLUDE_LIBS:
[tor-commits] [tor/master] New email for Lukas Fleischer
commit f15e7d4a1b7dd2bc2f9ebb46a1e9ca9c6a2010fe Author: Nick Mathewson ni...@torproject.org Date: Wed Apr 22 09:49:23 2015 -0400 New email for Lukas Fleischer --- doc/HACKING |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/HACKING b/doc/HACKING index c74e293..a144c4b 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -569,7 +569,7 @@ on dist-master. {blueness} at gentoo dot org {paul} at invizbox dot io {ondrej.mikle} at gmail dot com - {archlinux} at cryptocrack dot de + {lfleischer} at archlinux dot org 10) Add the version number to Trac. To do this, go to Trac, log in, select Admin near the top of the screen, then select Versions from ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] Revert branding for setting icon
commit 60463a20f5620f0697a468b2cb7e9be150c6024d Author: Sukhbir Singh sukh...@torproject.org Date: Wed Apr 22 10:03:02 2015 -0400 Revert branding for setting icon --- projects/instantbird/branding/icon.png | Bin 707 - 0 bytes projects/instantbird/build |1 - projects/instantbird/config|1 - 3 files changed, 2 deletions(-) diff --git a/projects/instantbird/branding/icon.png b/projects/instantbird/branding/icon.png deleted file mode 100644 index 6fe3d75..000 Binary files a/projects/instantbird/branding/icon.png and /dev/null differ diff --git a/projects/instantbird/build b/projects/instantbird/build index 79e47d3..5a60536 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -46,7 +46,6 @@ do done cat ../spi-cacert.der mozilla/security/nss/lib/ckfw/builtins/certdata.txt cp ../cert_override.txt im/app/profile -cp ../branding/icon.png im/branding/messenger/default16.png cd mozilla if ls -1 $rootdir/*.mozpatch /dev/null 21 then diff --git a/projects/instantbird/config b/projects/instantbird/config index 04b9326..0edbf91 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -69,7 +69,6 @@ input_files: - filename: installer.patch - filename: cert_override.txt - filename: branding/name.patch - - filename: branding/icon.png - filename: fix-mingw-build.patch enable: '[% c(var/windows) %]' - filename: 'mozconfig-[% c(var/osname) %]' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torsocks/master] Add support for the various inotify routines when invoked via syscall().
commit 824d88b9e47f8e2f3e5a3158f440154a04c2eb55 Author: Yawning Angel yawn...@schwanenlied.me Date: Tue Apr 7 11:37:41 2015 + Add support for the various inotify routines when invoked via syscall(). Signed-off-by: Yawning Angel yawn...@schwanenlied.me --- src/common/compat.h | 13 + src/lib/syscall.c | 49 + 2 files changed, 62 insertions(+) diff --git a/src/common/compat.h b/src/common/compat.h index 187818c..e7e5812 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -119,6 +119,7 @@ void tsocks_mutex_unlock(tsocks_mutex_t *m); #include sys/epoll.h #include sys/eventfd.h +#include sys/inotify.h #ifndef __NR_epoll_create1 #define __NR_epoll_create1 -128 @@ -135,12 +136,24 @@ void tsocks_mutex_unlock(tsocks_mutex_t *m); #ifndef __NR_eventfd2 #define __NR_eventfd2 -132 #endif +#ifndef __NR_inotify_init1 +#define __NR_inotify_init1 -133 +#endif +#ifndef __NR_inotify_add_watch +#define __NR_inotify_add_watch -134 +#endif +#ifndef __NR_inotify_rm_watch +#define __NR_inotify_rm_watch -135 +#endif #define TSOCKS_NR_EPOLL_CREATE1 __NR_epoll_create1 #define TSOCKS_NR_EPOLL_WAIT__NR_epoll_wait #define TSOCKS_NR_EPOLL_PWAIT __NR_epoll_pwait #define TSOCKS_NR_EPOLL_CTL __NR_epoll_ctl #define TSOCKS_NR_EVENTFD2 __NR_eventfd2 +#define TSOCKS_NR_INOTIFY_INIT1 __NR_inotify_init1 +#define TSOCKS_NR_INOTIFY_ADD_WATCH __NR_inotify_add_watch +#define TSOCKS_NR_INOTIFY_RM_WATCH __NR_inotify_rm_watch #endif /* __linux__ */ diff --git a/src/lib/syscall.c b/src/lib/syscall.c index 55e2447..c3bbd56 100644 --- a/src/lib/syscall.c +++ b/src/lib/syscall.c @@ -312,6 +312,46 @@ static LIBC_SYSCALL_RET_TYPE handle_eventfd2(va_list args) return eventfd(initval, flags); } + +/* + * Handle inotify_init1(2) syscall. + */ +static LIBC_SYSCALL_RET_TYPE handle_inotify_init1(va_list args) +{ + int flags; + flags = va_arg(args, __typeof__(flags)); + + return inotify_init1(flags); +} + +/* + * Handle inotify_add_watch(2) syscall. + */ +static LIBC_SYSCALL_RET_TYPE handle_inotify_add_watch(va_list args) +{ + int fd; + const char *pathname; + uint32_t mask; + + fd = va_arg(args, __typeof__(fd)); + pathname = va_arg(args, __typeof__(pathname)); + mask = va_arg(args, __typeof__(mask)); + + return inotify_add_watch(fd, pathname, mask); +} + +/* + * Handle inotify_rm_watch(2) syscall. + */ +static LIBC_SYSCALL_RET_TYPE handle_inotify_rm_watch(va_list args) +{ + int fd, wd; + + fd = va_arg(args, __typeof__(fd)); + wd = va_arg(args, __typeof__(wd)); + + return inotify_rm_watch(fd, wd); +} #endif /* __linux__ */ /* @@ -406,6 +446,15 @@ LIBC_SYSCALL_RET_TYPE tsocks_syscall(long int number, va_list args) case TSOCKS_NR_EVENTFD2: ret = handle_eventfd2(args); break; + case TSOCKS_NR_INOTIFY_INIT1: + ret = handle_inotify_init1(args); + break; + case TSOCKS_NR_INOTIFY_ADD_WATCH: + ret = handle_inotify_add_watch(args); + break; + case TSOCKS_NR_INOTIFY_RM_WATCH: + ret = handle_inotify_rm_watch(args); + break; #endif /* __linux__ */ default: /* ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torsocks/master] Support the eventfd2(2) syscall.
commit d6d79e31abe97b55ea944e13e134813aabe1bc86 Author: Yawning Angel yawn...@schwanenlied.me Date: Tue Apr 7 11:28:53 2015 + Support the eventfd2(2) syscall. Signed-off-by: Yawning Angel yawn...@schwanenlied.me --- src/common/compat.h |5 + src/lib/syscall.c | 17 + 2 files changed, 22 insertions(+) diff --git a/src/common/compat.h b/src/common/compat.h index 8c3be78..187818c 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -118,6 +118,7 @@ void tsocks_mutex_unlock(tsocks_mutex_t *m); */ #include sys/epoll.h +#include sys/eventfd.h #ifndef __NR_epoll_create1 #define __NR_epoll_create1 -128 @@ -131,11 +132,15 @@ void tsocks_mutex_unlock(tsocks_mutex_t *m); #ifndef __NR_epoll_ctl #define __NR_epoll_ctl -131 #endif +#ifndef __NR_eventfd2 +#define __NR_eventfd2 -132 +#endif #define TSOCKS_NR_EPOLL_CREATE1 __NR_epoll_create1 #define TSOCKS_NR_EPOLL_WAIT__NR_epoll_wait #define TSOCKS_NR_EPOLL_PWAIT __NR_epoll_pwait #define TSOCKS_NR_EPOLL_CTL __NR_epoll_ctl +#define TSOCKS_NR_EVENTFD2 __NR_eventfd2 #endif /* __linux__ */ diff --git a/src/lib/syscall.c b/src/lib/syscall.c index c6585a8..55e2447 100644 --- a/src/lib/syscall.c +++ b/src/lib/syscall.c @@ -298,6 +298,20 @@ static LIBC_SYSCALL_RET_TYPE handle_epoll_ctl(va_list args) return epoll_ctl(epfd, op, fd, event); } + +/* + * Handle eventfd2(2) syscall. + */ +static LIBC_SYSCALL_RET_TYPE handle_eventfd2(va_list args) +{ + unsigned int initval; + int flags; + + initval = va_arg(args, __typeof__(initval)); + flags = va_arg(args, __typeof__(flags)); + + return eventfd(initval, flags); +} #endif /* __linux__ */ /* @@ -389,6 +403,9 @@ LIBC_SYSCALL_RET_TYPE tsocks_syscall(long int number, va_list args) case TSOCKS_NR_EPOLL_CTL: ret = handle_epoll_ctl(args); break; + case TSOCKS_NR_EVENTFD2: + ret = handle_eventfd2(args); + break; #endif /* __linux__ */ default: /* ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torsocks/master] Support the various epoll routines when invoked via syscall().
commit 5e7d572a52a8fe6774d3b5d3177eb12461a234b7 Author: Yawning Angel yawn...@schwanenlied.me Date: Tue Apr 7 11:10:47 2015 + Support the various epoll routines when invoked via syscall(). Signed-off-by: Yawning Angel yawn...@schwanenlied.me --- src/common/compat.h | 26 + src/lib/syscall.c | 80 +++ 2 files changed, 106 insertions(+) diff --git a/src/common/compat.h b/src/common/compat.h index b4bef9a..8c3be78 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -111,6 +111,32 @@ void tsocks_mutex_unlock(tsocks_mutex_t *m); #define TSOCKS_NR_FUTEX __NR_futex #define TSOCKS_NR_ACCEPT4 __NR_accept4 +/* + * Despite glibc providing wrappers for these calls for a long time + * (as in even Debian squeeze has all the wrappers), libuv decided to + * use syscall() to invoke them instead. + */ + +#include sys/epoll.h + +#ifndef __NR_epoll_create1 +#define __NR_epoll_create1 -128 +#endif +#ifndef __NR_epoll_wait +#define __NR_epoll_wait -129 +#endif +#ifndef __NR_epoll_pwait +#define __NR_epoll_pwait -130 +#endif +#ifndef __NR_epoll_ctl +#define __NR_epoll_ctl -131 +#endif + +#define TSOCKS_NR_EPOLL_CREATE1 __NR_epoll_create1 +#define TSOCKS_NR_EPOLL_WAIT__NR_epoll_wait +#define TSOCKS_NR_EPOLL_PWAIT __NR_epoll_pwait +#define TSOCKS_NR_EPOLL_CTL __NR_epoll_ctl + #endif /* __linux__ */ #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__darwin__) || defined(__NetBSD__)) diff --git a/src/lib/syscall.c b/src/lib/syscall.c index 5dad3ce..c6585a8 100644 --- a/src/lib/syscall.c +++ b/src/lib/syscall.c @@ -230,6 +230,74 @@ static LIBC_SYSCALL_RET_TYPE handle_accept4(va_list args) return tsocks_accept4(sockfd, addr, addrlen, flags); } + +/* + * Handle epoll_create1(2) syscall. + */ +static LIBC_SYSCALL_RET_TYPE handle_epoll_create1(va_list args) +{ + int flags; + + flags = va_arg(args, __typeof__(flags)); + + return epoll_create1(flags); +} + +/* + * Handle epoll_wait(2) syscall. + */ +static LIBC_SYSCALL_RET_TYPE handle_epoll_wait(va_list args) +{ + int epfd; + struct epoll_event *events; + int maxevents; + int timeout; + + epfd = va_arg(args, __typeof__(epfd)); + events = va_arg(args, __typeof__(events)); + maxevents = va_arg(args, __typeof__(maxevents)); + timeout = va_arg(args, __typeof__(maxevents)); + + return epoll_wait(epfd, events, maxevents, timeout); +} + +/* + * Handle epoll_pwait(2) syscall. + */ +static LIBC_SYSCALL_RET_TYPE handle_epoll_pwait(va_list args) +{ + int epfd; + struct epoll_event *events; + int maxevents; + int timeout; + const sigset_t *sigmask; + + epfd = va_arg(args, __typeof__(epfd)); + events = va_arg(args, __typeof__(events)); + maxevents = va_arg(args, __typeof__(maxevents)); + timeout = va_arg(args, __typeof__(maxevents)); + sigmask = va_arg(args, __typeof__(sigmask)); + + return epoll_pwait(epfd, events, maxevents, timeout, sigmask); +} + +/* + * Handle epoll_ctl(2) syscall. + */ +static LIBC_SYSCALL_RET_TYPE handle_epoll_ctl(va_list args) +{ + int epfd; + int op; + int fd; + struct epoll_event *event; + + epfd = va_arg(args, __typeof__(epfd)); + op = va_arg(args, __typeof__(op)); + fd = va_arg(args, __typeof__(fd)); + event = va_arg(args, __typeof__(event)); + + return epoll_ctl(epfd, op, fd, event); +} #endif /* __linux__ */ /* @@ -309,6 +377,18 @@ LIBC_SYSCALL_RET_TYPE tsocks_syscall(long int number, va_list args) case TSOCKS_NR_ACCEPT4: ret = handle_accept4(args); break; + case TSOCKS_NR_EPOLL_CREATE1: + ret = handle_epoll_create1(args); + break; + case TSOCKS_NR_EPOLL_WAIT: + ret = handle_epoll_wait(args); + break; + case TSOCKS_NR_EPOLL_PWAIT: + ret = handle_epoll_pwait(args); + break; + case TSOCKS_NR_EPOLL_CTL: + ret = handle_epoll_ctl(args); + break; #endif /* __linux__ */ default: /* ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torsocks/master] Support certain Linux specific syscalls.
commit e428ae4bbea17cab194a8c3acd99bc44614b0901 Author: Yawning Angel yawn...@schwanenlied.me Date: Sat Mar 28 13:55:55 2015 + Support certain Linux specific syscalls. This adds support for the following non-portable Linux-isms: * gettid(2) * getrandom(2) * futex(2) The futex(2) support assumes a semi-modern kernel (= 2.6.7) as the futex system call had an extra argument added at that time. Signed-off-by: Yawning Angel yawn...@schwanenlied.me --- src/common/compat.h | 12 ++ src/lib/syscall.c | 61 +++ 2 files changed, 73 insertions(+) diff --git a/src/common/compat.h b/src/common/compat.h index 766b1fd..6fca641 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -84,6 +84,15 @@ void tsocks_mutex_unlock(tsocks_mutex_t *m); #ifndef __NR_recvmsg #define __NR_recvmsg -9 #endif +#ifndef __NR_gettid +#define __NR_gettid -10 +#endif +#ifndef __NR_getrandom +#define __NR_getrandom -11 +#endif +#ifndef __NR_futex +#define __NR_futex -12 +#endif #define TSOCKS_NR_SOCKET__NR_socket #define TSOCKS_NR_CONNECT __NR_connect @@ -94,6 +103,9 @@ void tsocks_mutex_unlock(tsocks_mutex_t *m); #define TSOCKS_NR_GETPEERNAME __NR_getpeername #define TSOCKS_NR_LISTEN__NR_listen #define TSOCKS_NR_RECVMSG __NR_recvmsg +#define TSOCKS_NR_GETTID__NR_gettid +#define TSOCKS_NR_GETRANDOM __NR_getrandom +#define TSOCKS_NR_FUTEX __NR_futex #endif /* __linux__ */ diff --git a/src/lib/syscall.c b/src/lib/syscall.c index ec1..52ee4c2 100644 --- a/src/lib/syscall.c +++ b/src/lib/syscall.c @@ -164,6 +164,56 @@ static LIBC_RECVMSG_RET_TYPE handle_recvmsg(va_list args) return tsocks_recvmsg(sockfd, msg, flags); } +#if defined(__linux__) +/* + * Handle gettid(2) syscall. + */ +static LIBC_SYSCALL_RET_TYPE handle_gettid(void) +{ + return tsocks_libc_syscall(TSOCKS_NR_GETTID); +} + +/* + * Handle getrandom(2) syscall. + */ +static LIBC_SYSCALL_RET_TYPE handle_getrandom(va_list args) +{ + void *buf; + size_t buflen; + unsigned int flags; + + buf = va_arg(args, __typeof__(buf)); + buflen = va_arg(args, __typeof__(buflen)); + flags = va_arg(args, __typeof__(flags)); + + return tsocks_libc_syscall(TSOCKS_NR_GETRANDOM, buf, buflen, flags); +} + +/* + * Handle futex(2) syscall. + */ +static LIBC_SYSCALL_RET_TYPE handle_futex(va_list args) +{ + /* This assumes Linux 2.6.7 or later, as that is when 'val3' was +* added to futex(2). Kernel versions prior to that are what I +* would consider historic. +*/ + const struct timespec *timeout; + int *uaddr, *uaddr2; + int op, val, val3; + + uaddr = va_arg(args, __typeof__(uaddr)); + op = va_arg(args, __typeof__(op)); + val = va_arg(args, __typeof__(val)); + timeout = va_arg(args, __typeof__(timeout)); + uaddr2 = va_arg(args, __typeof__(uaddr2)); + val3 = va_arg(args, __typeof__(val3)); + + return tsocks_libc_syscall(TSOCKS_NR_FUTEX, uaddr, op, val, timeout, + uaddr2, val3); +} +#endif /* __linux__ */ + /* * Torsocks call for syscall(2) */ @@ -228,6 +278,17 @@ LIBC_SYSCALL_RET_TYPE tsocks_syscall(long int number, va_list args) case TSOCKS_NR_RECVMSG: ret = handle_recvmsg(args); break; +#if defined(__linux__) + case TSOCKS_NR_GETTID: + ret = handle_gettid(); + break; + case TSOCKS_NR_GETRANDOM: + ret = handle_getrandom(args); + break; + case TSOCKS_NR_FUTEX: + ret = handle_futex(args); + break; +#endif /* __linux__ */ default: /* * Because of the design of syscall(), we can't pass a va_list to it so ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torsocks/master] Handle accept4(2) when invoked via syscall().
commit 53b8569f545c45a443e746695f6b1b5de64fb65a Author: Yawning Angel yawn...@schwanenlied.me Date: Tue Apr 7 10:38:15 2015 + Handle accept4(2) when invoked via syscall(). Signed-off-by: Yawning Angel yawn...@schwanenlied.me --- src/common/compat.h |4 src/lib/syscall.c | 21 + src/lib/torsocks.h |1 + 3 files changed, 26 insertions(+) diff --git a/src/common/compat.h b/src/common/compat.h index 6fca641..b4bef9a 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -93,6 +93,9 @@ void tsocks_mutex_unlock(tsocks_mutex_t *m); #ifndef __NR_futex #define __NR_futex -12 #endif +#ifndef __NR_accept4 +#define __NR_accept4 -13 +#endif #define TSOCKS_NR_SOCKET__NR_socket #define TSOCKS_NR_CONNECT __NR_connect @@ -106,6 +109,7 @@ void tsocks_mutex_unlock(tsocks_mutex_t *m); #define TSOCKS_NR_GETTID__NR_gettid #define TSOCKS_NR_GETRANDOM __NR_getrandom #define TSOCKS_NR_FUTEX __NR_futex +#define TSOCKS_NR_ACCEPT4 __NR_accept4 #endif /* __linux__ */ diff --git a/src/lib/syscall.c b/src/lib/syscall.c index 52ee4c2..5dad3ce 100644 --- a/src/lib/syscall.c +++ b/src/lib/syscall.c @@ -212,6 +212,24 @@ static LIBC_SYSCALL_RET_TYPE handle_futex(va_list args) return tsocks_libc_syscall(TSOCKS_NR_FUTEX, uaddr, op, val, timeout, uaddr2, val3); } + +/* + * Handle accept4(2) syscall. + */ +static LIBC_SYSCALL_RET_TYPE handle_accept4(va_list args) +{ + int sockfd; + struct sockaddr *addr; + socklen_t addrlen; + int flags; + + sockfd = va_arg(args, __typeof__(sockfd)); + addr = va_arg(args, __typeof__(addr)); + addrlen = va_arg(args, __typeof__(addrlen)); + flags = va_arg(args, __typeof__(flags)); + + return tsocks_accept4(sockfd, addr, addrlen, flags); +} #endif /* __linux__ */ /* @@ -288,6 +306,9 @@ LIBC_SYSCALL_RET_TYPE tsocks_syscall(long int number, va_list args) case TSOCKS_NR_FUTEX: ret = handle_futex(args); break; + case TSOCKS_NR_ACCEPT4: + ret = handle_accept4(args); + break; #endif /* __linux__ */ default: /* diff --git a/src/lib/torsocks.h b/src/lib/torsocks.h index 3b9cda2..81073cf 100644 --- a/src/lib/torsocks.h +++ b/src/lib/torsocks.h @@ -388,6 +388,7 @@ TSOCKS_DECL(accept, LIBC_ACCEPT_RET_TYPE, LIBC_ACCEPT_SIG) /* accept4(2) */ #if (defined(__linux__)) extern TSOCKS_LIBC_DECL(accept4, LIBC_ACCEPT4_RET_TYPE, LIBC_ACCEPT4_SIG) +TSOCKS_DECL(accept4, LIBC_ACCEPT4_RET_TYPE, LIBC_ACCEPT4_SIG) #define LIBC_ACCEPT4_DECL LIBC_ACCEPT4_RET_TYPE \ LIBC_ACCEPT4_NAME(LIBC_ACCEPT4_SIG) #endif ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed
commit 66746148b35b0b617c7ee395bbf45fe7c6126e7b Author: Translation commit bot translat...@torproject.org Date: Wed Apr 22 20:15:07 2015 + Update translations for bridgedb_completed --- pl/LC_MESSAGES/bridgedb.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pl/LC_MESSAGES/bridgedb.po b/pl/LC_MESSAGES/bridgedb.po index d0b4424..8e96fb3 100644 --- a/pl/LC_MESSAGES/bridgedb.po +++ b/pl/LC_MESSAGES/bridgedb.po @@ -17,7 +17,7 @@ msgid msgstr Project-Id-Version: The Tor Project\n Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'POT-Creation-Date: 2015-03-19 22:13+\n -PO-Revision-Date: 2015-04-22 19:41+\n +PO-Revision-Date: 2015-04-22 19:52+\n Last-Translator: Karol Obartuch kobart...@luc.edu\n Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n MIME-Version: 1.0\n ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] Update translations for bridgedb
commit eb1ace6ae19e9357c7927fc3fd41c2782fa5ddc7 Author: Translation commit bot translat...@torproject.org Date: Wed Apr 22 20:15:03 2015 + Update translations for bridgedb --- pl/LC_MESSAGES/bridgedb.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pl/LC_MESSAGES/bridgedb.po b/pl/LC_MESSAGES/bridgedb.po index d0b4424..8e96fb3 100644 --- a/pl/LC_MESSAGES/bridgedb.po +++ b/pl/LC_MESSAGES/bridgedb.po @@ -17,7 +17,7 @@ msgid msgstr Project-Id-Version: The Tor Project\n Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'POT-Creation-Date: 2015-03-19 22:13+\n -PO-Revision-Date: 2015-04-22 19:41+\n +PO-Revision-Date: 2015-04-22 19:52+\n Last-Translator: Karol Obartuch kobart...@luc.edu\n Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n MIME-Version: 1.0\n ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torsocks/master] Fix: indentation in getpeername test
commit 2845ef59eeb4e19e46c6a27059c3e0997ffbe9d2 Author: David Goulet dgou...@ev0ke.net Date: Wed Apr 22 16:16:49 2015 -0400 Fix: indentation in getpeername test Signed-off-by: David Goulet dgou...@ev0ke.net --- tests/test_getpeername.c |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_getpeername.c b/tests/test_getpeername.c index df464d2..faf4149 100644 --- a/tests/test_getpeername.c +++ b/tests/test_getpeername.c @@ -90,7 +90,8 @@ static void test_getpeername(void) /* Large but valid addrlen. */ addrlen = sizeof(ss); ret = getpeername(inet_sock, (struct sockaddr *)ss, addrlen); - ok(ret == 0 addrlen == sizeof(addrv4), Valid returned IP address from getpeername(), large addrlen); + ok(ret == 0 addrlen == sizeof(addrv4), + Valid returned IP address from getpeername(), large addrlen); error: if (inet_sock = 0) { ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torsocks/master] Fix the broken getpeername() implementation.
commit 2c060e39201effd50d28a6107135fda9ea2ce908 Author: Yawning Angel yawn...@schwanenlied.me Date: Sat Mar 28 15:23:07 2015 + Fix the broken getpeername() implementation. Signed-off-by: Yawning Angel yawn...@schwanenlied.me --- src/lib/getpeername.c| 24 +--- tests/test_getpeername.c | 12 +++- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/lib/getpeername.c b/src/lib/getpeername.c index bd93a2b..d8bf701 100644 --- a/src/lib/getpeername.c +++ b/src/lib/getpeername.c @@ -33,6 +33,7 @@ LIBC_GETPEERNAME_RET_TYPE tsocks_getpeername(LIBC_GETPEERNAME_SIG) { int ret = 0; struct connection *conn; + socklen_t sz = 0; DBG([getpeername] Requesting address on socket %d, sockfd); @@ -51,19 +52,9 @@ LIBC_GETPEERNAME_RET_TYPE tsocks_getpeername(LIBC_GETPEERNAME_SIG) } /* -* Extra check for addrlen since we are about to copy the connection -* content into the given address. -*/ - if (*addrlen sizeof(struct sockaddr)) { - /* Ref to the manpage for the returned value here. */ - errno = EINVAL; - ret = -1; - goto end; - } - - /* -* Copy connected destination address into the given addr with only the -* given len so we don't overflow on purpose. +* Copy the minimum of *addrlen and the size of the actual address +* into the given addr. There are applications that pass in buffers +* that are rather large, which is acceptable behavior. */ switch (conn-dest_addr.domain) { case CONNECTION_DOMAIN_NAME: @@ -73,16 +64,19 @@ LIBC_GETPEERNAME_RET_TYPE tsocks_getpeername(LIBC_GETPEERNAME_SIG) * that has been returned to the application. */ case CONNECTION_DOMAIN_INET: + sz = min(sizeof(conn-dest_addr.u.sin), *addrlen); memcpy(addr, (const struct sockaddr *) conn-dest_addr.u.sin, - *addrlen); + sz); break; case CONNECTION_DOMAIN_INET6: + sz = min(sizeof(conn-dest_addr.u.sin6), *addrlen); memcpy(addr, (const struct sockaddr *) conn-dest_addr.u.sin6, - *addrlen); + sz); break; } /* Success. */ + *addrlen = sz; errno = 0; ret = 0; diff --git a/tests/test_getpeername.c b/tests/test_getpeername.c index 516596e..df464d2 100644 --- a/tests/test_getpeername.c +++ b/tests/test_getpeername.c @@ -32,6 +32,7 @@ static void test_getpeername(void) char buf[INET_ADDRSTRLEN]; struct sockaddr addr; struct sockaddr_in addrv4; + struct sockaddr_storage ss; socklen_t addrlen; const char *ip = 93.95.227.222; @@ -68,11 +69,7 @@ static void test_getpeername(void) goto error; } - /* Very large addrlen. */ - addrlen = -1; - ret = getpeername(inet_sock, addr, addrlen); - ok(ret == -1 errno == EINVAL, Invalid addrlen); - + /* Invalid arguments */ addrlen = sizeof(addr); ret = getpeername(inet_sock, NULL, addrlen); ok(ret == -1 errno == EFAULT, Invalid addr ptr); @@ -90,6 +87,11 @@ static void test_getpeername(void) ok(ret == 0 strncmp(buf, ip, strlen(ip)) == 0, Valid returned IP address from getpeername()); + /* Large but valid addrlen. */ + addrlen = sizeof(ss); + ret = getpeername(inet_sock, (struct sockaddr *)ss, addrlen); + ok(ret == 0 addrlen == sizeof(addrv4), Valid returned IP address from getpeername(), large addrlen); + error: if (inet_sock = 0) { close(inet_sock); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torsocks/master] Merge remote-tracking branch 'yawning/getpeername'
commit d38e2c4d2fdbd52c81d0e43b3ab5090f42cef426 Merge: 824d88b 2c060e3 Author: David Goulet dgou...@ev0ke.net Date: Wed Apr 22 16:15:07 2015 -0400 Merge remote-tracking branch 'yawning/getpeername' src/lib/getpeername.c| 24 +--- tests/test_getpeername.c | 12 +++- 2 files changed, 16 insertions(+), 20 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/master] Update the updater config file
commit e3cc7044dbec5ff8fd834c06bf486da03c9dc311 Author: Georg Koppen g...@torproject.org Date: Wed Apr 22 20:28:49 2015 + Update the updater config file --- tools/update-responses/config.yml |2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 1475195..8c6110d 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -10,6 +10,7 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 4.5 +release: 4.5 versions: 4.5: platformVersion: 31.6.0 @@ -17,6 +18,7 @@ versions: download_url: https://www.torproject.org/dist/torbrowser/4.5 incremental_from: - 4.5a5 + - 4.0.8 migrate_archs: osx32: osx64 osx32: ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torbutton/master] Update changelog for 1.9.2.1.
commit d215393de112d742c5d88336a71bc7a4dab8e4f5 Author: Mike Perry mikeperry-...@torproject.org Date: Wed Apr 22 00:57:47 2015 -0700 Update changelog for 1.9.2.1. --- src/CHANGELOG |3 +++ 1 file changed, 3 insertions(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index e50f5b6..4a3353d 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +1.9.2.1: + * Bug 14429: Disable window resizing for now. + 1.9.2.0: * Bug 15562: Bind SharedWorkers to thirdparty pref * Bug 15533: Restore default security level when restoring defaults ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/master] Update Changelog
commit 7f6d8de86e51dfff1fafa5bebc888496bf80a2f6 Author: Georg Koppen g...@torproject.org Date: Wed Apr 22 08:17:04 2015 + Update Changelog --- Bundle-Data/Docs/ChangeLog.txt |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 5233f60..ee17952 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -12,7 +12,7 @@ Tor Browser 4.5 -- Apr 28 2015 * Bug 11879: Stop bootstrap if Cancel or Open Settings is clicked * Bug 13576: Don't strip bridge from the middle of bridge lines * Bug 15657: Display the host:port of any connection faiures in bootstrap - * Update Torbutton to 1.9.2.0 + * Update Torbutton to 1.9.2.1 * Bug 15562: Bind SharedWorkers to thirdparty pref * Bug 15533: Restore default security level when restoring defaults * Bug 15510: Close Tor Circuit UI control port connections on New Identity @@ -22,7 +22,7 @@ Tor Browser 4.5 -- Apr 28 2015 * Bug 4100: Raise HTTP Keep-Alive back to 115 second default * Bug 13875: Spoof window.devicePixelRatio to avoid DPI fingerprinting * Bug 15411: Remove old (and unused) cacheDomain cache isolation mechanism - * Bug 14716: Fix issues with HTTP Auth usage and TLS connection info display + * Bugs 14716+13254: Fix issues with HTTP Auth usage and TLS connection info display * Bug 15502: Isolate blob URI scope to URL domain; block WebWorker access * Bug 15562: Disable Javascript SharedWorkers due to third party tracking * Bug 15757: Disable Mozilla video statistics API extensions ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torbutton/master] Bug 14429: Disable resizing for now.
commit 0e20a8156e86111281e4d8a0684b753056e52ea7 Author: Mike Perry mikeperry-...@torproject.org Date: Wed Apr 22 00:56:55 2015 -0700 Bug 14429: Disable resizing for now. --- src/defaults/preferences/preferences.js |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 85fd953..68c4f60 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -159,7 +159,7 @@ pref(extensions.torbutton.close_newnym,true); pref(extensions.torbutton.block_js_history,true); pref(extensions.torbutton.resize_on_toggle,true); pref(extensions.torbutton.resize_new_windows,true); -pref(extensions.torbutton.resize_windows,true); +pref(extensions.torbutton.resize_windows,false); pref(extensions.torbutton.banned_ports,9050,9051,9150,9151); pref(extensions.torbutton.block_tor_file_net,true); pref(extensions.torbutton.block_nontor_file_net,false); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/master] Update Torbutton to 1.9.2.1
commit fa486aff85025ed4a3022a39025ba1a10269126b Author: Mike Perry mikeperry-...@torproject.org Date: Wed Apr 22 00:59:01 2015 -0700 Update Torbutton to 1.9.2.1 --- Bundle-Data/Docs/ChangeLog.txt |1 + gitian/versions|2 +- gitian/versions.alpha |2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 7e4b01c..5233f60 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -18,6 +18,7 @@ Tor Browser 4.5 -- Apr 28 2015 * Bug 15510: Close Tor Circuit UI control port connections on New Identity * Bug 15472: Make node text black in circuit status UI * Bug 15502: Wipe blob URIs on New Identity + * Bug 14429: Disable automatic window resizing for now * Bug 4100: Raise HTTP Keep-Alive back to 115 second default * Bug 13875: Spoof window.devicePixelRatio to avoid DPI fingerprinting * Bug 15411: Remove old (and unused) cacheDomain cache isolation mechanism diff --git a/gitian/versions b/gitian/versions index 653b4b1..d490333 100755 --- a/gitian/versions +++ b/gitian/versions @@ -11,7 +11,7 @@ TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build2 TOR_TAG=tor-0.2.6.7 TORLAUNCHER_TAG=0.2.7.4 -TORBUTTON_TAG=1.9.2.0 +TORBUTTON_TAG=1.9.2.1 HTTPSE_TAG=5.0.2 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 6419111..7f323be 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -11,7 +11,7 @@ TORBROWSER_UPDATE_CHANNEL=alpha TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build2 TOR_TAG=tor-0.2.6.7 TORLAUNCHER_TAG=0.2.7.4 -TORBUTTON_TAG=1.9.2.0 +TORBUTTON_TAG=1.9.2.1 HTTPSE_TAG=5.0.2 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] Add icon for Tor Messenger (branding)
commit 1bd86234b13927d8d92a341952589f2a38836f7c Author: Sukhbir Singh sukh...@torproject.org Date: Wed Apr 22 05:09:23 2015 -0400 Add icon for Tor Messenger (branding) --- projects/instantbird/branding/icon.png | Bin 0 - 707 bytes projects/instantbird/build |5 + projects/instantbird/config|1 + 3 files changed, 6 insertions(+) diff --git a/projects/instantbird/branding/icon.png b/projects/instantbird/branding/icon.png new file mode 100644 index 000..6fe3d75 Binary files /dev/null and b/projects/instantbird/branding/icon.png differ diff --git a/projects/instantbird/build b/projects/instantbird/build index c4bd842..79e47d3 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -40,8 +40,13 @@ for patch in $(ls -1 ../*.patch | sort) do patch -p1 $patch done +for patch in $(ls -1 ../branding/*.patch | sort) +do + patch -p1 $patch +done cat ../spi-cacert.der mozilla/security/nss/lib/ckfw/builtins/certdata.txt cp ../cert_override.txt im/app/profile +cp ../branding/icon.png im/branding/messenger/default16.png cd mozilla if ls -1 $rootdir/*.mozpatch /dev/null 21 then diff --git a/projects/instantbird/config b/projects/instantbird/config index 0edbf91..04b9326 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -69,6 +69,7 @@ input_files: - filename: installer.patch - filename: cert_override.txt - filename: branding/name.patch + - filename: branding/icon.png - filename: fix-mingw-build.patch enable: '[% c(var/windows) %]' - filename: 'mozconfig-[% c(var/osname) %]' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits