August 2012 - tor-commits - lists.torproject.org

[translation/gettor] Update translations for gettor
by translation＠torproject.org 18 Aug '12

18 Aug '12

commit 573fa302d42ac6ca99dd51100f88306f1ff14be6 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 18 11:45:04 2012 +0000 Update translations for gettor --- el/gettor.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/el/gettor.po b/el/gettor.po index 42d48e5..ceab22f 100644 --- a/el/gettor.po +++ b/el/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.… [View More]torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-08-18 11:14+0000\n" +"PO-Revision-Date: 2012-08-18 11:24+0000\n" "Last-Translator: anvo <fragos.george(a)hotmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -380,21 +380,21 @@ msgstr "linux-x86_64:\nÎ€Î¿ Î Î±ÎºÎÏÎ¿ Î ÎµÏÎ¹Î·Î³Î·ÏÎ® Tor Î³Î¹Î± ÏÏÎ¿Î» msgid "" "source:\n" "The Tor source code, for experts. Most users do not want this package." -msgstr "" +msgstr "source:\nÎ ÏÎ·Î³Î±Î¯Î¿ ÎºÏÎŽÎ¹ÎºÎ±Ï ÏÎ¿Ï Tor Î³Î¹Î± ÎµÎ¹ÎŽÎ¹ÎºÎ¿ÏÏ. Î€Î¿ ÏÎ±ÎºÎÏÎ¿ Î±ÏÏÏ Î±ÏÎµÏÎžÏÎœÎµÏÎ±Î¹ ÏÎµ Î»Î¯Î³Î¿ÏÏ ÏÏÎ®ÏÏÎµÏ." #: lib/gettor/i18n.py:238 msgid "" "FREQUENTLY ASKED QUESTIONS\n" "==========================" -msgstr "" +msgstr "Î£Î¥Î§ÎÎ ÎÎÎÎ€Î¥Î Î©ÎÎÎÎÎ£ ÎÎ¡Î©Î€ÎÎ£ÎÎÎ£ Î FAQ\n===================================" #: lib/gettor/i18n.py:241 msgid "What is Tor?" -msgstr "" +msgstr "Î€Î¹ ÎµÎ¯ÎœÎ±Î¹ ÏÎ¿ Tor;" #: lib/gettor/i18n.py:243 msgid "The name \"Tor\" can refer to several different components." -msgstr "" +msgstr "Î€Î¿ ÏÎœÎ¿ÎŒÎ± \"Tor\" Î±ÎœÎ±ÏÎÏÎµÏÎ±Î¹ ÏÎµ ÏÎ¿Î»Î»Î¬ ÎºÎ±Î¹ ÎŽÎ¹Î¬ÏÎ¿ÏÎ± ÏÏÎ¿Î¹ÏÎµÎ¯Î±." #: lib/gettor/i18n.py:245 msgid "" @@ -407,18 +407,18 @@ msgid "" "Tor network. You can read more about how Tor works here:\n" "\n" " https://www.torproject.org/about/overview.html.en" -msgstr "" +msgstr "Î€Î¿ Î»Î¿Î³Î¹ÏÎŒÎ¹ÎºÏ Tor ÎµÎ¯ÎœÎ±Î¹ ÎÎœÎ± ÏÏÏÎ³ÏÎ±ÎŒÎŒÎ± Î³Î¹Î± ÏÎ¿Îœ ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ® ÏÎ±Ï ÏÎ¿Ï\nÏÏÎŒÎ²Î¬Î»Î»ÎµÎ¹ ÏÏÎ·Îœ Î±ÏÏÎ¬Î»ÎµÎ¹Î¬ ÏÎ±Ï ÏÏÎ¿ ÎÎ¹Î±ÎŽÎ¯ÎºÏÏÎ¿. Î€Î¿ Tor ÏÎ±Ï ÏÏÎ¿ÏÏÎ±ÏÎµÏÎµÎ¹ Î±ÎœÎ±ÎŒÎµÏÎ±ÎŽÎ¯ÎŽÎ¿ÎœÏÎ±Ï ÏÎ¹Ï ÎµÏÎ¹ÎºÎ¿Î¹ÎœÏÎœÎ¯ÎµÏ ÏÎ±Ï ÎŒÎÏÎ± ÏÎµ ÎÎœÎ± ÎºÎ±ÏÎ±ÎœÎµÎŒÎ·ÎŒÎÎœÎ¿ ÎŽÎ¯ÎºÏÏÎ¿ Î±ÎœÎ±ÎŒÎµÏÎ±ÎŽÎ¿ÏÏÎœ Î¿Î¹ Î¿ÏÎ¿Î¯Î¿Î¹ ÎµÎºÏÎµÎ»Î¿ÏÎœÏÎ±Î¹ Î±ÏÏ ÎµÎžÎµÎ»Î¿ÎœÏÎÏ ÏÏÏÏ ÎµÏÎµÎ¯Ï\nÏÎ±ÎœÏÎ¿Ï ÏÏÎ¿Îœ ÎºÏÏÎŒÎ¿: ÎµÎŒÏÎ¿ÎŽÎ¯Î¶ÎµÎ¹ ÏÏÎ¯ÏÎ¿ÏÏ ÎœÎ± ÏÎ±ÏÎ±ÎºÎ¿Î»Î¿ÏÎžÎ¿ÏÎœ ÏÎ·Îœ ÏÏÎœÎŽÎµÏÎ® ÏÎ±Ï ÏÏÎ¿ ÎÎ¹Î±ÎŽÎ¯ÎºÏÏÎ¿\nÎºÎ±Î¹ ÎœÎ± Î³ÎœÏÏÎ¯Î¶Î¿ÏÎœ ÏÎ¿Î¹Î¿ÏÏ Î¹ÏÏÏÏÎ¿ÏÎ¿ÏÏ ÎµÏÎ¹ÏÎºÎÏÏÎµÏÎžÎµ, Î±Î»Î»Î¬ ÎµÎŒÏÎ¿ÎŽÎ¯Î¶ÎµÎ¹ ÎºÎ±Î¹ ÏÎ¿ÏÏ Î¹ÏÏÏÏÎ¿ÏÎ¿ÏÏ ÏÎ¿Ï ÎµÏÎ¹ÏÎºÎÏÏÎµÏÎžÎµ\nÎœÎ± Î³ÎœÏÏÎ¯Î¶Î¿ÏÎœ ÏÎ·Îœ ÏÏÏÎ¹ÎºÎ® ÏÎ±Ï ÏÎ¿ÏÎ¿ÎžÎµÏÎ¯Î±. ÎÏÏÏ ÏÎ¿ ÏÏÎœÎ¿Î»Î¿ ÎµÎžÎµÎ»Î¿ÎœÏÎ¹ÎºÏÎœ Î±ÎœÎ±ÎŒÎµÏÎ±ÎŽÎ¿ÏÏÎœ Î¿ÎœÎ¿ÎŒÎ¬Î¶ÎµÏ Î±Î¹\nÎŽÎ¯ÎºÏÏÎ¿ Tor. Î ÎµÏÎ¹ÏÏÏÏÎµÏÎ± Î³Î¹Î± ÏÎ¿Îœ ÏÏÏÏÎ¿ Î»ÎµÎ¹ÏÎ¿ÏÏÎ³Î¯Î±Ï ÏÎ¿Ï Tor ÎŒÏÎ¿ÏÎµÎ¯ÏÎµ ÎœÎ± ÎŒÎ¬ÎžÎµÏÎµ ÎµÎŽÏ:\n\nhttps://www.torproject.org/about/overview.html.en" #: lib/gettor/i18n.py:255 msgid "What is the Tor Browser Bundle?" -msgstr "" +msgstr "Î€Î¹ ÎµÎ¯ÎœÎ±Î¹ ÏÎ¿ Î Î±ÎºÎÏÎ¿ Î ÎµÏÎ¹Î·Î³Î·ÏÎ® Tor;" #: lib/gettor/i18n.py:257 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 "" +msgstr "Î€Î¿ Î Î±ÎºÎÏÎ¿ Î ÎµÏÎ¹Î·Î³Î·ÏÎ® Tor (Î€ÎÎ) ÎµÎ¯ÎœÎ±Î¹ ÏÎ¿ ÏÎ±ÎºÎÏÎ¿ Î»Î¿Î³Î¹ÏÎŒÎ¹ÎºÎ¿Ï ÏÎ¿Ï ÏÏÎœÎ¹ÏÏÎ¿ÏÎŒÎµ ÏÏÎ¿ÏÏ ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ¿ÏÏ ÏÏÎ®ÏÏÎµÏ.\nÎ€Î¿ ÏÎ±ÎºÎÏÎ¿ ÏÎµÏÎ¹Î»Î±ÎŒÎ²Î¬ÎœÎµÎ¹ ÏÎ»Î± ÏÏÎ± ÏÏÎµÎ¹Î¬Î¶ÎµÏÏÎµ Î³Î¹Î± Î±ÏÏÎ±Î»Î® ÏÎµÏÎ¹Î®Î³Î·ÏÎ· ÏÏÎ¿ ÎÎ¹Î±ÎŽÎ¯ÎºÏÏÎ¿.\nÎÏÎ»ÏÏ ÏÎ¿ Î±ÏÎ¿ÏÏÎŒÏÎ¹ÎÎ¶ÎµÏÎµ ÎºÎ±Î¹ ÏÎ¿ ÎµÎºÏÎµÎ»ÎµÎ¯ÏÎµ." #: lib/gettor/i18n.py:261 msgid "What package should I request?" [View Less]

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 18 Aug '12

18 Aug '12

commit f6772830369a373ebe0fcd6b198d5e090bbfb43e Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 18 11:15:04 2012 +0000 Update translations for gettor --- el/gettor.po | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/el/gettor.po b/el/gettor.po index 5612e33..42d48e5 100644 --- a/el/gettor.po +++ b/el/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-… [View More]Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-08-18 10:44+0000\n" +"PO-Revision-Date: 2012-08-18 11:14+0000\n" "Last-Translator: anvo <fragos.george(a)hotmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -179,7 +179,7 @@ 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 "" +msgstr "4.) Έπειτα, αποσυμπιέστε τα πολλαπλά αρχεία σε ένα,\nδιπλοπατώντας το αρχείο με κατάληξη \"..split.part01.exe\". Η ενέργεια αυτή θα ξεκινήσει την \nδιαδικασία αυτόματα." #: lib/gettor/i18n.py:121 msgid "" @@ -196,13 +196,13 @@ msgstr "6) Ολοκληρώθηκε η διαδικασία. Σας ευχαρι msgid "" "SUPPORT\n" "=======" -msgstr "" +msgstr "ΥΠΟΣΤΗΡΙΞΗ\n===========" #: lib/gettor/i18n.py:133 msgid "" "Here's your requested software as a zip file. Please unzip the\n" "package and verify the signature." -msgstr "" +msgstr "Αυτό είναι το λογισμικό που ζητήσατε, ως αρχείο zip. Παρακαλούμε αποσυμπιέστε το\nπακέτο και εξακριβώστε την υπογραφή του." #: lib/gettor/i18n.py:136 msgid "" @@ -212,14 +212,14 @@ msgid "" "tool as follows after unpacking the zip file:\n" "\n" " gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" -msgstr "" +msgstr "ΕΞΑΚΡΙΒΣΗ ΥΠΟΓΡΑΦΗΣ\n=====================\nΑν στον υπολογιστή σας είναι εγκατεστημένο το GnuPG, χρησιμοποιήστε\nτο εργαλείο γραμμής εντολής gpg ως εξής, αφού αποσυμπιέσετε το αρχείο zip:\n\ngpg -verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" #: lib/gettor/i18n.py:143 msgid "" "The output should look somewhat like this:\n" "\n" " gpg: Good signature from 'Erinn Clark <...>'" -msgstr "" +msgstr "Το αποτέλεσμα θα μοιάζει κάπως έτσι:\n\ngpg: Good signature from 'Errin Clark <...>'" #: lib/gettor/i18n.py:147 msgid "" @@ -227,13 +227,13 @@ msgid "" "a graphical user interface for GnuPG on this website:\n" "\n" " http://www.gnupg.org/related_software/frontends.html" -msgstr "" +msgstr "Αν δεν είστε εξοικειωμένος/η με τα εργαλεία γραμμής εντολής, αναζητήστε κάποιο\nγραφικό πρόγραμμα για το GnuPG στην ιστοσελίδα:\n\nhttp://www.gnupg.org/related_software/frontends.html" #: lib/gettor/i18n.py:152 msgid "" "BLOCKED ACCESS / CENSORSHIP\n" "===========================" -msgstr "" +msgstr "ΦΡΑΓΜΕΝΗ ΠΡΟΣΒΑΣΗ/ΛΟΓΟΚΡΙΣΙΑ\n================================" #: lib/gettor/i18n.py:155 msgid "" @@ -251,7 +251,7 @@ msgid "" "in the body of the email to the following email address:\n" "\n" " bridges(a)torproject.org" -msgstr "" +msgstr "Μπορείτε να αποκτήσετε μια γέφυρα στέλνοντας ένα ηλεκτρονικό μήνυμα που θα περιέχει την φράση \"get bridges\"\nστο σώμα του μηνύματος, στην διεύθυνση που ακολουθεί:\nbridges@torproject.org" #: lib/gettor/i18n.py:167 msgid "" @@ -279,13 +279,13 @@ msgstr "Τα πακέτα μπορούν να ληφθούν με τυχαία msgid "" "It was successfully understood. Your request is currently being processed.\n" "Your package (%s) should arrive within the next ten minutes." -msgstr "" +msgstr "Το μήνυμά σας είναι κατανοητό. Το αίτημά σας είναι υπό επεξεργασία.\nΤο πακέτο (%s) θα σας αποσταλεί μέσα στα επόμενα δέκα λεπτά." #: lib/gettor/i18n.py:182 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 "" +msgstr "Αν δεν λάβετε το πακέτο, ίσως είναι πολύ μεγάλο για την εταιρία που σας παρέχει υπηρεσίες ηλεκτρονικού ταχυδρομείου.\nΠροσπαθήστε να στείλετε εκ νέου το μήνυμα μέσα από κάποιον λογαριασμό GMAIL.COM, YAHOO.CN ή YAHOO.COM." #: lib/gettor/i18n.py:185 msgid "" @@ -305,7 +305,7 @@ msgstr "Δυστυχώς δεν υπάρχει διαθέσιμο πακέτο msgid "" "UNPACKING THE FILES\n" "===================" -msgstr "" +msgstr "ΑΠΟΣΥΜΠΙΕΣΗ ΤΩΝ ΑΡΧΕΙΩΝ\n=========================" #: lib/gettor/i18n.py:196 msgid "" @@ -314,13 +314,13 @@ msgid "" "your computer yet, you can download it here:\n" "\n" " http://www.7-zip.org/" -msgstr "" +msgstr "Ο ευκολότερος τρόπος για να αποσυμπιέσετε τα αρχεία που λάβατε είναι να εγκαταστήσετε την εφαρμογή 7-Zip,\nένα δωρεάν εργαλείο συμπίεσης/αποσυμπίεσης αρχείου. Αν δεν το έχετε ήδη εγκατεστημένο στον υπολογιστή σας, μπορείτε να το λάβετε από εδώ:\n\nhttp://www.7-zip.org/" #: lib/gettor/i18n.py:202 msgid "" "When 7-Zip is installed, you can open the .z archive you received from\n" "us by double-clicking on it." -msgstr "" +msgstr "Όταν εγκατασταθεί το 7-Zip μπορείτε να ανοίξετε το αρχείο .z που λάβατε από\nεμάς, κάνοντας επάνω του δυο κλικ." #: lib/gettor/i18n.py:205 msgid "" @@ -328,13 +328,13 @@ msgid "" ".zip. For example, if you recevied a file called \"windows.z\", rename it to \n" "\"windows.zip\". You should then be able to extract the archive with common \n" "file archiver programs that probably are already installed on your computer." -msgstr "" +msgstr "Ένας εναλλακτικός τρόπος αποσυμπίεσης των αρχείων .z είναι να μετονομάσετε την κατάληξή τους σε\n.zip. Για παράδειγμα, αν παραλάβατε κάποιο αρχείο με όνομα \"windows.z\", μετονομάστε το σε \"windows.zip\". Έτσι, θα μπορέσετε να εξάγετε τα αρχεία με οποιοδήποτε κοινό\nπρόγραμμα συμπίεσης/αποσυμπίεσης αρχείου το οποίο είναι, ίσως, ήδη εγκατεστημένο στον υπολογιστή σας." #: lib/gettor/i18n.py:210 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 "" +msgstr "Παρακαλούμε απαντήστε στο μήνυμα αυτό και γράψτε ένα οποιοδήποτε όνομα πακέτου οπουδήποτε\nμέσα στην απάντησή σας. Ακολουθεί μια σύντομη εξήγηση αυτών των πακέτων:" #: lib/gettor/i18n.py:213 msgid "" @@ -342,21 +342,21 @@ msgid "" "The Tor Browser Bundle package for Windows operating systems. If you're \n" "running some version of Windows, like Windows XP, Windows Vista or \n" "Windows 7, this is the package you should get." -msgstr "" +msgstr "windows:\nΤο Πακέτο Περιηγητή Tor για λειτουργικά συστήματα Windows. Αν εκτελείτε\nκάποια έκδοση Windows, όπως το Windows XP, το Windows Vista ή\nWindows 7, αυτό είναι το πακέτο που πρέπει να παραλάβετε." #: lib/gettor/i18n.py:218 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 "" +msgstr "macos-i386:\nΤο Πακέτο Περιηγητή Tor για OS X αρχιτεκτονικής Intel CPU. Γενικά\nοι νεότεροι υπολογιστές Mac απαιτούν την χρήση αυτού του πακέτου." #: lib/gettor/i18n.py:222 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 "" +msgstr "macos-ppc:\nΑυτό είναι ένα παλαιότερο πακέτο (το \"πακέτο Vidalia\") για παλαιότερα Mac που τρέχουν\nOS X με PowerPC CPU. Σημειώστε ότι, το πακέτο αυτό σύντομα θα καταργηθεί." #: lib/gettor/i18n.py:226 msgid "" @@ -368,13 +368,13 @@ msgstr "linux-i386: \nΤο πακέτο Tor Browser Bundle για το Linux, 32 msgid "" "Note that this package is rather large and needs your email provider to \n" "allow for attachments of about 30MB in size." -msgstr "" +msgstr "Σημειώστε ότι το πακέτο αυτό είναι μεγάλο και πρέπει ο πάροχος υπηρεσιών ηλεκτρονικού ταχυδρομείου να\nεπιτρέπει την επικόλληση αρχείων με μέγεθος περίπου 30ΜΒ." #: lib/gettor/i18n.py:232 msgid "" "linux-x86_64:\n" "The Tor Browser Bundle package for Linux, 64bit versions." -msgstr "" +msgstr "linux-x86_64:\nΤο Πακέτο Περιηγητή Tor για υπολογιστές με Linux, έκδοσης 64bit." #: lib/gettor/i18n.py:235 msgid "" [View Less]

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 18 Aug '12

18 Aug '12

commit 0a57c92d2464a6d9d7f3694772879a20f6a830a4 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 18 10:45:04 2012 +0000 Update translations for gettor --- el/gettor.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/el/gettor.po b/el/gettor.po index cb78af0..5612e33 100644 --- a/el/gettor.po +++ b/el/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.… [View More]torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-08-15 16:30+0000\n" +"PO-Revision-Date: 2012-08-18 10:44+0000\n" "Last-Translator: anvo <fragos.george(a)hotmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -94,7 +94,7 @@ 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 "" +msgstr "Το παράδειγμα που ακολουθεί θα σας παράσχει το πακέτο που ζητήσατε στην τοπικοποιημένη\nέκδοση για την γλώσσα Farsi (Περσικά). Αναζητήστε πιο κάτω την λίστα των υποστηριζόμενων\nκωδικών γλώσσας." #: lib/gettor/i18n.py:71 msgid " List of supported locales:" @@ -127,14 +127,14 @@ msgstr "Εάν δεν επιλέξετε γλώσσα, θα λάβετε την msgid "" "SMALLER SIZED PACKAGES\n" "======================" -msgstr "" +msgstr "ΠΑΚΕΤΑ ΜΙΚΡΟΤΕΡΟΥ ΜΕΓΕΘΟΥΣ\n=============================" #: lib/gettor/i18n.py:92 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 "" +msgstr "Αν το εύρος ζώνης της σύνδεσής σας είναι μικρό ή αν ο πάροχος υπηρεσιών διαδικτύου δεν σας επιτρέπει να\nλαμβάνετε μεγάλα αρχεία στην διεύθυνση ταχυδρομείου σας, το GetTor μπορεί να σας αποστείλει πολλαπλά\nμικρά πακέτα αντί για ένα ενιαίο μεγάλο πακέτο." #: lib/gettor/i18n.py:96 msgid "" @@ -143,7 +143,7 @@ msgid "" " \n" " windows\n" " split" -msgstr "" +msgstr "Απλώς γράψτε την λέξη 'split' μόνη της σε μια νέα γραμμή του μηνύματός σας (η ενέργεια αυτή\nείναι σημαντική!), ως εξής:\n\nwindows\nsplit" #: lib/gettor/i18n.py:102 msgid "" @@ -166,7 +166,7 @@ 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 "" +msgstr "2.) Αποσυμπιέστε όλα τα αρχεία που έχουν κατάληξη \".z\". Αν αποθηκεύσατε όλα τα επισυναπτόμενα αρχεία σε ένα κατάλογο νωρίτερα, απλώς αποσυμπιέστε όλα τα αρχεία σε αυτόν το κατάλογο. Αν\nδεν γνωρίζετε πώς να αποσυμπιέσετε τα αρχεία .z, παρακαλούμε διαβάστε την ενότητα ΑΠΟΣΥΜΠΙΕΣΗ ΤΩΝ ΑΡΧΕΙΩΝ." #: lib/gettor/i18n.py:114 msgid "" [View Less]

1 0

[ooni-probe/master] * Fix some bugs in Daphn3
by art＠torproject.org 18 Aug '12

18 Aug '12

commit 818e4603d4d2a91f033b013db2b3dfecc5c99114 Author: Arturo Filastò <hellais(a)torproject.org> Date: Thu Aug 2 17:42:43 2012 +0200 * Fix some bugs in Daphn3 * Add more details to Test interface * Remove dead code in Reporting system * Make some changes to bridget --- bin/ooniprobe | 5 +- ooni/lib/Makefile | 4 ++ ooni/ooniprobe.py | 3 +- ooni/plugins/bridget.py | 10 +++- ooni/plugins/daphn3.py | 23 +++++------ ooni/plugoo/… [View More]interface.py | 9 ++++ ooni/plugoo/reports.py | 93 +++------------------------------------------- ooni/plugoo/tests.py | 5 +- ooni/protocols/daphn3.py | 15 +++++-- 9 files changed, 56 insertions(+), 111 deletions(-) diff --git a/bin/ooniprobe b/bin/ooniprobe index 505e1c2..5c87831 100755 --- a/bin/ooniprobe +++ b/bin/ooniprobe @@ -1,4 +1,5 @@ #!/bin/sh -ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )" +ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +echo $ROOT export PYTHONPATH=$PYTHONPATH:$ROOT -python $ROOT/ooni/ooniprobe.py +python $ROOT/ooni/ooniprobe.py $1 diff --git a/ooni/lib/Makefile b/ooni/lib/Makefile index 4cfbee3..3b0c922 100644 --- a/ooni/lib/Makefile +++ b/ooni/lib/Makefile @@ -12,6 +12,10 @@ txtorcon: mv txtorcon.git/txtorcon txtorcon rm -rf txtorcon.git +clean: + rm -rf txtorcon + rm -rf txtraceroute.py + #txscapy: # echo "Processing dependency txscapy" # git clone https://github.com/hellais/txscapy.git txscapy.git diff --git a/ooni/ooniprobe.py b/ooni/ooniprobe.py index b75deca..2189ddb 100755 --- a/ooni/ooniprobe.py +++ b/ooni/ooniprobe.py @@ -84,7 +84,8 @@ def runTest(test, options, global_options, reactor=reactor): test.runTool() return - if test.end: + if test.ended: + print "Ending because it's ended" return wgen = work.WorkGenerator(test, diff --git a/ooni/plugins/bridget.py b/ooni/plugins/bridget.py index fa3cb67..22ff9a0 100644 --- a/ooni/plugins/bridget.py +++ b/ooni/plugins/bridget.py @@ -33,6 +33,7 @@ class bridgetTest(OONITest): from ooni.lib.txtorcon import DEFAULT_VALUE, launch_tor def updates(prog, tag, summary): log.msg("%d%%: %s" % (prog, summary)) + return def setup_failed(args): log.msg("Setup Failed.") @@ -45,15 +46,18 @@ class bridgetTest(OONITest): return report config = TorConfig() - config.SocksPort = 9999 - config.OrPort = 1234 + import random + config.SocksPort = random.randint(1024, 2**16) + config.ControlPort = random.randint(1024, 2**16) + if 'bridge' in args: config.UseBridges = 1 config.Bridge = args['bridge'] config.save() + print config.create_torrc() report = {'tor_config': config.config} log.msg("Starting Tor") - d = launch_tor(config, reactor, progress_updates=updates) + d = launch_tor(config, self.reactor, progress_updates=updates) d.addCallback(setup_complete) d.addErrback(setup_failed) return d diff --git a/ooni/plugins/daphn3.py b/ooni/plugins/daphn3.py index 6c1186e..091fe8a 100644 --- a/ooni/plugins/daphn3.py +++ b/ooni/plugins/daphn3.py @@ -16,31 +16,29 @@ from ooni.utils import log class Daphn3ClientProtocol(daphn3.Daphn3Protocol): def connectionMade(self): - print "I have made a connection!" self.next_state() - def connectionLost(self, reason): - pass - class Daphn3ClientFactory(protocol.ClientFactory): protocol = Daphn3ClientProtocol mutator = None steps = None test = None - report = reports.Report('daphn3', 'daphn3.yamlooni') def buildProtocol(self, addr): p = self.protocol() - p.report = self.report p.factory = self + p.test = self.test + if self.steps: p.steps = self.steps if not self.mutator: self.mutator = daphn3.Mutator(p.steps) + else: print "Moving on to next mutation" self.mutator.next() + p.mutator = self.mutator return p @@ -48,6 +46,7 @@ class Daphn3ClientFactory(protocol.ClientFactory): print "We failed connecting the the OONIB" print "Cannot perform test. Perhaps it got blocked?" print "Please report this to tor-assistants(a)torproject.org" + self.test.result['error'] = ('Failed in connecting to OONIB', reason) self.test.end(d) def clientConnectionLost(self, reason): @@ -108,15 +107,16 @@ class daphn3Test(OONITest): def control(self, exp_res, args): try: mutation = self.factory.mutator.get(0) + self.result['censored'] = False except: mutation = None - return {'mutation_number': args['mutation'], 'value': mutation} + + return {'mutation_number': args['mutation'], + 'value': mutation} def _failure(self, *argc, **kw): - print "We failed connecting the the OONIB" - print "Cannot perform test. Perhaps it got blocked?" - print "Please report this to tor-assistants(a)torproject.org" - print "Traceback: %s %s" % (argc, kw) + self.result['censored'] = True + self.result['error'] = ('Failed in connecting', (argc, kw)) self.end() def experiment(self, args): @@ -133,7 +133,6 @@ class daphn3Test(OONITest): d = endpoint.connect(self.factory) d.addErrback(self._failure) return d - #return endpoint.connect(Daphn3ClientFactory) def load_assets(self): if not self.steps: diff --git a/ooni/plugoo/interface.py b/ooni/plugoo/interface.py index c3b3855..d00e70b 100644 --- a/ooni/plugoo/interface.py +++ b/ooni/plugoo/interface.py @@ -44,3 +44,12 @@ class ITest(Interface): If the test does not have any assets it should return an empty dict. """ + def end(): + """ + This can be called at any time to terminate the execution of all of + these test instances. + + What this means is that no more test instances with new parameters will + be created. A report will be written. + """ + diff --git a/ooni/plugoo/reports.py b/ooni/plugoo/reports.py index 3a9c5d2..a543151 100644 --- a/ooni/plugoo/reports.py +++ b/ooni/plugoo/reports.py @@ -4,7 +4,7 @@ import os import yaml import itertools -from ooni.utils import log, date +from ooni.utils import log, date, net class Report: """This is the ooni-probe reporting mechanism. It allows @@ -46,10 +46,11 @@ class Report: header += "# %s\n\n" % pretty_date self._write_to_report(header) # XXX replace this with something proper + address = net.getClientAddress() test_details = {'start_time': str(date.now()), - 'asn': 'ASN-1234', + 'asn': address['asn'], 'test_name': self.testname, - 'addr': '1234'} + 'addr': address['ip']} self(test_details) def _write_to_report(self, dump): @@ -73,98 +74,16 @@ class Report: This should be invoked every time you wish to write some data to the reporting system """ - #print "Writing report(s)" - #dump = '--- \n' dump = yaml.dump([data]) - #dump += yaml.dump(data) - self._write_to_report(dump) - def file_report(self, data, file=None, mode='a+'): + def file_report(self, data): """ This reports to a file in YAML format """ - if not file: - file = self.file - with open(file, mode) as f: + with open(self.file, 'a+') as f: f.write(data) - def tcp_report(self, data): - """ - This connect to the specified tcp server - and writes the data passed as argument. - """ - host, port = self.tcp.split(":") - tcp = socket.getprotobyname('tcp') - send_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM, tcp) - try: - send_socket.connect((host, int(port))) - send_socket.send(data) - - except Exception, e: - raise e - - finally: - send_socket.close() - - - def scp_report(self, data, rfile=None, mode='a+'): - """ - Push data to the remote ssh server. - - :rfile the remote filename to write - :data the raw data content that should be written - :mode in what mode the file should be created - """ - if not rfile: - rfile = self.file - host, port = self.scp.split(":") - transport = paramiko.Transport((host, port)) - - # The remote path of the remote file to write - rfpath = os.path.join(self.config.ssh_rpath, rfile) - - try: - username = self.config.ssh_username - except: - raise "No username provided" - - # Load the local known host key file - transport.load_host_keys(os.path.expanduser("~/.ssh/known_hosts")) - - # We prefer to use an ssh keyfile fo authentication - if self.config.ssh_keyfile: - keyfile = os.path.expanduser(self.config.ssh_keyfile) - key = paramiko.RSAKey.from_private_key_file(keylocfile) - try: - transport.connect(username=username, pkey=key) - except Exception, e: - raise e - - # If not even a password is fine - elif self.config.ssh_password: - try: - transport.connect(username=username, password=self.config.ssh_password) - except Exception, e: - raise e - - # ... but no authentication, that is madness! - else: - raise "No key or password provided for ssh" - - sftp = paramiko.SFTPClient.from_transport(transport) - try: - sftp = ssh.open_sftp() - remote_file = sftp.file(rfile, mode) - remote_file.set_pipelined(True) - remote_file.write(data) - - except Exception, e: - raise e - sftp.close() - transport.close() - - def send_report(self, data, type): """ This sends the report using the diff --git a/ooni/plugoo/tests.py b/ooni/plugoo/tests.py index 482b8bc..7c190eb 100644 --- a/ooni/plugoo/tests.py +++ b/ooni/plugoo/tests.py @@ -26,6 +26,7 @@ class OONITest(object): blocking = False reactor = None tool = False + ended = False def __init__(self, local_options, global_options, report, ooninet=None, reactor=None): @@ -65,7 +66,7 @@ class OONITest(object): """ self.ended = True - def finished(self, control): + def finished(self, return_value): """ The Test has finished running, we must now calculate the test runtime and add all time data to the report. @@ -76,7 +77,7 @@ class OONITest(object): result['start_time'] = str(self.start_time) result['end_time'] = str(self.end_time) result['run_time'] = str(self.end_time - self.start_time) - result['control'] = control + result['return_value'] = return_value log.msg("FINISHED %s" % result) self.report(result) return result diff --git a/ooni/protocols/daphn3.py b/ooni/protocols/daphn3.py index d7471ab..7514a40 100644 --- a/ooni/protocols/daphn3.py +++ b/ooni/protocols/daphn3.py @@ -208,6 +208,8 @@ class Daphn3Protocol(protocol.Protocol): to_receive_data = 0 report = reports.Report('daphn3', 'daphn3.yamlooni') + test = None + def next_state(self): """ This is called once I have completed one step of the protocol and need @@ -267,10 +269,11 @@ class Daphn3Protocol(protocol.Protocol): print "The connection was closed because of %s" % report['reason'] print "State %s, Mutator %s" % (report['proto_state'], report['mutator_state']) + if self.test: + self.test.result['censored'] = True + self.test.result['state'] = report self.mutator.next() - - def connectionLost(self, reason): """ The connection was closed. This may be because of a legittimate reason @@ -289,8 +292,12 @@ class Daphn3Protocol(protocol.Protocol): else: print "I have reached the end of the state machine" print "Censorship fingerprint bruteforced!" - report = {'mutator_state': self.mutator.state()} - self.report(report) + if self.test: + print "In the test thing" + self.test.result['censored'] = False + self.test.result['state'] = report + self.test.result['state_walk_finished'] = True + self.test.report(self.test.result) return if reason.check(ConnectionDone): [View Less]

1 0

[ooni-probe/master] Fix some bugs in unittests based on minor changes to plugoo
by art＠torproject.org 18 Aug '12

18 Aug '12

commit 2212a647109f5ce341a34c92bdfea5af06b70d8a Author: Arturo Filastò <hellais(a)torproject.org> Date: Thu Aug 2 17:49:20 2012 +0200 Fix some bugs in unittests based on minor changes to plugoo --- ooni/ooniprobe.py | 4 ++-- tests/test_tests.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ooni/ooniprobe.py b/ooni/ooniprobe.py index 2189ddb..2799985 100755 --- a/ooni/ooniprobe.py +++ b/ooni/ooniprobe.py @@ -94,8 +94,6 @@ def runTest(test, options, … [View More]

1 0

[ooni-probe/master] Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe
by art＠torproject.org 18 Aug '12

18 Aug '12

commit a979d19d2b843fc8e723f44bb5597b57215f963b Merge: 3af48cc 1d8240c Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Aug 17 21:32:53 2012 -0700 Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe Conflicts: ooni/ooniprobe.py ooni/ooniprobe.py | 2 +- ooni/plugins/daphn3.py | 2 + oonib/INSTALL | 4 ++ oonib/report/api.py | 98 +++++++++++++++++++++++++++++++++++++++++++ oonib/report/db/… [View More]

1 0

[ooni-probe/master] Minor refactoring of various parts
by art＠torproject.org 18 Aug '12

18 Aug '12

commit 3af48ccd706dd1f56faf6d4e46d8db8216d20822 Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Aug 17 21:31:52 2012 -0700 Minor refactoring of various parts --- ooni/plugins/captiveportal.py | 17 +++++++++++++---- ooni/plugins/daphn3.py | 1 + ooni/protocols/daphn3.py | 4 +++- oonib/testhelpers/daphn3.py | 1 + 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ooni/plugins/captiveportal.py b/ooni/plugins/captiveportal.py index … [View More]b48f70b..4bf99b3 100644 --- a/ooni/plugins/captiveportal.py +++ b/ooni/plugins/captiveportal.py @@ -31,6 +31,7 @@ try: from dns import resolver except ImportError: print "The dnspython module was not found. https://crate.io/packages/dnspython/" + resolver = None __plugoo__ = "captiveportal" __desc__ = "Captive portal detection test" @@ -132,7 +133,10 @@ class CaptivePortal(OONITest): or a list of strings. If nameserver is not given, use local DNS resolver, and if that fails try using 8.8.8.8. """ - + if not resolver: + log.msg("dnspython is not installed.\ + Cannot perform DNS Resolve test") + return [] if isinstance(hostname, str): hostname = [hostname] @@ -192,6 +196,11 @@ class CaptivePortal(OONITest): The equivalent of: $ dig +short NS ooni.nu """ + if not resolver: + log.msg("dnspython not installed.") + log.msg("Cannot perform test.") + return [] + res = resolver.Resolver() answer = res.query(hostname, 'NS') auth_nameservers = [] @@ -211,9 +220,9 @@ class CaptivePortal(OONITest): for char in hostname: l33t = random.choice(['caps', 'nocaps']) if l33t == 'caps': - hostname_0x20 = hostname_0x20 + char.capitalize() + hostname_0x20 += char.capitalize() else: - hostname_0x20 = hostname_0x20 + char.lower() + hostname_0x20 += char.lower() return hostname_0x20 def check_0x20_to_auth_ns(self, hostname, sample_size=None): @@ -394,7 +403,7 @@ class CaptivePortal(OONITest): log.debug("just magically resolved to a bunch of random addresses.") log.debug("That is definitely highly improbable. In fact, my napkin") log.debug("tells me that the probability of just one of those") - log.degug("hostnames resolving to an address is 1.68e-59, making") + log.debug("hostnames resolving to an address is 1.68e-59, making") log.debug("it nearly twice as unlikely as an MD5 hash collision.") log.debug("Either someone is seriously messing with your network,") log.debug("or else you are witnessing the impossible. %s" % r) diff --git a/ooni/plugins/daphn3.py b/ooni/plugins/daphn3.py index 091fe8a..a6d51b0 100644 --- a/ooni/plugins/daphn3.py +++ b/ooni/plugins/daphn3.py @@ -40,6 +40,7 @@ class Daphn3ClientFactory(protocol.ClientFactory): self.mutator.next() p.mutator = self.mutator + p.current_state = self.mutator.state() return p def clientConnectionFailed(self, reason): diff --git a/ooni/protocols/daphn3.py b/ooni/protocols/daphn3.py index 7514a40..a4cc32a 100644 --- a/ooni/protocols/daphn3.py +++ b/ooni/protocols/daphn3.py @@ -201,6 +201,8 @@ class Daphn3Protocol(protocol.Protocol): steps = [] mutator = None + current_state = None + role = 'client' state = 0 total_states = len(steps) - 1 @@ -283,7 +285,7 @@ class Daphn3Protocol(protocol.Protocol): print "Terminated because of little interest in life." return report = {'reason': reason, 'proto_state': self.state, - 'trigger': None, 'mutator_state': self.mutator.state()} + 'trigger': None, 'mutator_state': self.current_state} if self.state < self.total_states: report['trigger'] = 'did not finish state walk' diff --git a/oonib/testhelpers/daphn3.py b/oonib/testhelpers/daphn3.py index 2dd2801..facd11f 100644 --- a/oonib/testhelpers/daphn3.py +++ b/oonib/testhelpers/daphn3.py @@ -40,6 +40,7 @@ class Daphn3Server(protocol.ServerFactory): self.mutations.pop(addr.host) try: p.mutator = self.mutations[addr.host] + p.current_state = p.mutator.state() except: pass return p [View Less]

1 0

[ooni-probe/master] ImStart implementing OONIBackenD
by art＠torproject.org 18 Aug '12

18 Aug '12

commit 1d8240c746ec79381aafcb3d921568c90b70889b Author: Arturo Filastò <art(a)torproject.org> Date: Fri Aug 17 20:57:32 2012 -0700 ImStart implementing OONIBackenD (saving this commit from my broken laptop) --- oonib/INSTALL | 4 ++ oonib/report/api.py | 98 +++++++++++++++++++++++++++++++++++++++++++ oonib/report/db/__init__.py | 33 ++++++++++++++ oonib/report/db/models.py | 41 ++++++++++++++++++ 4 files changed, 176 insertions(+), 0 … [View More]deletions(-) diff --git a/oonib/INSTALL b/oonib/INSTALL new file mode 100644 index 0000000..1622707 --- /dev/null +++ b/oonib/INSTALL @@ -0,0 +1,4 @@ +BEWARE: This requires python 2.7.3 +storm (Storm ORM) +transaction (zope transaction) + diff --git a/oonib/report/api.py b/oonib/report/api.py new file mode 100644 index 0000000..04f70e0 --- /dev/null +++ b/oonib/report/api.py @@ -0,0 +1,98 @@ +""" +/report/do + +/report/pcap + +This is the async pcap reporting system. It requires the client to have created a report already, but can work independently from test progress. + +""" +import random +import strings +from twisted.internet import reactor +from cyclone import web +backend_version = '0.0.1' + +def generateReportID(): + size = 100 + id = ''.join(random.choice(strings.ascii_letters) for x in range(size)) + return id + +def newReport(software_name, software_version, test_name, test_version, + progress, content): + print "Software Name: %s" % software_name + print "Software Version: %s" % software_version + print "Test Name: %s" % test_name + print "Test Version: %s" % test_version + print "Progress: %s" % progress + print "Content: %s" % content + reportId = generateReportID() + return {'backend_version': backend_version, 'report_id': reportID} + +def updateReport(report_id, content): + print "Report ID: %s" % report_id + print "Content: %s" % content + return {'backend_version': '0.1', 'report_id': 'FOOBAR'} + +class DoReportHandler(web.RequestHandler): + """ + Responsible for creating and updating reports. + """ + def post(self): + """ + Creates a new report with the input + + * Request + + {'software_name': 'XXX', + 'software_version': 'XXX', + 'test_name': 'XXX', + 'test_version': 'XXX', + 'progress': 'XXX', + 'content': 'XXX' + } + + * Response + + {'backend_version': 'XXX', 'report_id': 'XXX'} + + """ + # This is the list of supported arguments + arguments = ['software_name', 'software_version', + 'test_name','test_version', + 'progress', 'content'] + report = {} + error = None + for arg in arguments: + if len(self.get_arguments(arg)) == 0: + print "No %s specified" % arg + error = arg + break + report[arg] = self.get_argument(arg) + if not error: + self.write(newReport(**report)) + + def put(self): + """ + Update an already existing report. + + {'report_id': 'XXX', + 'content': 'XXX' + } + """ + pass + +class PCAPReportHandler(web.RequestHandler): + def get(self): + pass + + def post(self): + pass + +handlers = [(r"/report/do", DoReportHandler), + (r"/report/pcap", PCAPReportHandler)] + +reporting = web.Application(handlers) +reactor.listenTCP(8888, reporting, interface="127.0.0.1") +print "starting bullshit" +reactor.run() + diff --git a/oonib/report/db/__init__.py b/oonib/report/db/__init__.py new file mode 100644 index 0000000..1248c19 --- /dev/null +++ b/oonib/report/db/__init__.py @@ -0,0 +1,33 @@ +__all__ = ['models'] + +from twisted.python import log +from twisted.python.threadpool import ThreadPool +from twisted.internet.defer import inlineCallbacks +from storm.twisted.transact import Transactor, transact +from storm.locals import * + +dbtype = "sqlite" + +if dbtype == "sqlite": + from storm.uri import URI + from storm.databases.sqlite import SQLite + database = SQLite(URI('sqlite:///test.db')) + +threadpool = ThreadPool(0, 10) +threadpool.start() +transactor = Transactor(threadpool) + +@inlineCallbacks +def create_tables(): + def create(query): + store = Store(database) + store.execute(query) + store.commit() + + for x in models.__all__: + query = getattr(models.__getattribute__(x), 'create_query') + try: + yield transactor.run(create, query) + except: + log.msg("Failing in creating table for %s. Maybe it already exists?" % x) + diff --git a/oonib/report/db/models.py b/oonib/report/db/models.py new file mode 100644 index 0000000..b4e56d0 --- /dev/null +++ b/oonib/report/db/models.py @@ -0,0 +1,41 @@ +from storm.twisted.transact import transact +from storm.locals import * + +class Report(object): + """ + This represents an OONI Report as stored in the database. + + report_id: this is generated by the backend and is used by the client to + reference a previous report and append to it. It should be + treated as a shared secret between the probe and backend. + + software_name: this indicates the name of the software performing the test + (this will default to ooniprobe) + + software_version: this is the version number of the software running the + test. + + test_name: the name of the test on which the report is being created. + + test_version: indicates the version of the test + + progress: what is the current progress of the report. This allows clients + to report event partial reports up to a certain percentage of + progress. Once the report is complete progress will be 100. + + content: what is the content of the report. If the current progress is less + than 100 we should append to the YAML data structure that is + currently stored in such field. + """ + id = Int(primary=True) + + report_id = Unicode() + + software_name = Unicode() + software_version = Unicode() + test_name = Unicode() + test_version = Unicode() + progress = Unicode() + + content = Unicode() + [View Less]

1 0

[tor/master] whitespace fix
by nickm＠torproject.org 17 Aug '12

17 Aug '12

commit 88859b2ff1fdd4e5f4fab8ad818131ea3c2dd1c8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 17 17:10:03 2012 -0400 whitespace fix --- src/or/config.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/or/config.h b/src/or/config.h index 48f4e86..dd76edc 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -102,6 +102,5 @@ int addressmap_register_auto(const char *from, const char *to, … [View More]

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 17 Aug '12

17 Aug '12

commit 661bd3fe714f0c9986eb872eb8eb5d72b2efc195 Merge: 1c64f99 88859b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 17 17:10:16 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' src/or/config.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)

1 0