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

[onionoo/master] Don't assume that in/ and out/ directories exist.
by karsten＠torproject.org 23 Aug '13

23 Aug '13

commit 3b142e9658ed56f735514694691c74ee18099f99 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Aug 23 09:13:29 2013 +0200 Don't assume that in/ and out/ directories exist. Spotted by Sebastian. --- src/org/torproject/onionoo/DescriptorSource.java | 12 +++++++++--- src/org/torproject/onionoo/DocumentStore.java | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/onionoo/DescriptorSource.java b/src/org/torproject/onionoo/DescriptorSource.java index 89fd1de..2bac013 100644 --- a/src/org/torproject/onionoo/DescriptorSource.java +++ b/src/org/torproject/onionoo/DescriptorSource.java @@ -110,8 +110,14 @@ class DescriptorQueue { + "to descriptor reader."); return; } - this.descriptorReader.addDirectory(new File(this.inDir, - directoryName)); + File directory = new File(this.inDir, directoryName); + if (directory.exists() && directory.isDirectory()) { + this.descriptorReader.addDirectory(directory); + } else { + System.err.println("Directory " + directory.getAbsolutePath() + + " either does not exist or is not a directory. Not adding " + + "to descriptor reader."); + } } public void readHistoryFile(DescriptorHistory descriptorHistory) { @@ -147,7 +153,7 @@ class DescriptorQueue { return; } this.historyFile = new File(this.statusDir, historyFileName); - if (this.historyFile.exists()) { + if (this.historyFile.exists() && this.historyFile.isFile()) { SortedMap<String, Long> excludedFiles = new TreeMap<String, Long>(); try { BufferedReader br = new BufferedReader(new FileReader( diff --git a/src/org/torproject/onionoo/DocumentStore.java b/src/org/torproject/onionoo/DocumentStore.java index 2271bf7..28fc0e6 100644 --- a/src/org/torproject/onionoo/DocumentStore.java +++ b/src/org/torproject/onionoo/DocumentStore.java @@ -455,6 +455,7 @@ public class DocumentStore { } String documentString = sb.toString(); try { + summaryFile.getParentFile().mkdirs(); BufferedWriter bw = new BufferedWriter(new FileWriter(summaryFile)); bw.write(documentString); bw.close(); @@ -474,6 +475,7 @@ public class DocumentStore { File updateFile = new File(this.outDir, "update"); String documentString = String.valueOf(System.currentTimeMillis()); try { + updateFile.getParentFile().mkdirs(); BufferedWriter bw = new BufferedWriter(new FileWriter(updateFile)); bw.write(documentString); bw.close();

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 23 Aug '13

23 Aug '13

commit e5b9d25b5dd2b504a231e216be6694195b7e5064 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 23 01:46:37 2013 +0000 Update translations for torbirdy_completed --- tr/torbirdy.dtd | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/tr/torbirdy.dtd b/tr/torbirdy.dtd index 42da9da..e4cca50 100644 --- a/tr/torbirdy.dtd +++ b/tr/torbirdy.dtd @@ -1,11 +1,10 @@ -<!ENTITY torbirdy.accountprefs.title "Hesap Konfigürasyonu"> -<!ENTITY torbirdy.accountprefs.startup.label "Yeni mesajlara başlangıçta bak"> +<!ENTITY torbirdy.accountprefs.title "Hesap Yapılandırması"> +<!ENTITY torbirdy.accountprefs.startup.label "Başlangıçta yeni iletileri denetle"> <!ENTITY torbirdy.accountprefs.startup.key "C"> -<!ENTITY torbirdy.accountprefs.minutes.label "Yeni mesajlara her XX de bak"> +<!ENTITY torbirdy.accountprefs.minutes.label "Yeni ileti denetleme süresi"> <!ENTITY torbirdy.accountprefs.minutes.key "y"> -<!ENTITY torbirdy.accountprefs.minutes.trail.label "dakikalar"> -<!ENTITY torbirdy.accountprefs.cancel.button "İptal - "> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "dakika"> +<!ENTITY torbirdy.accountprefs.cancel.button "İptal"> <!ENTITY torbirdy.accountprefs.save.button "Kaydet"> <!ENTITY torbirdy.accountprefs.save.key "S"> @@ -14,10 +13,12 @@ <!ENTITY torbirdy.prefs.save.key "s"> <!ENTITY torbirdy.prefs.cancel.button "İptal "> -<!ENTITY torbirdy.prefs.extra2.button "Ayarları test et"> +<!ENTITY torbirdy.prefs.extra1.button "Varsayılanı ayarla"> +<!ENTITY torbirdy.prefs.extra1.key "d"> +<!ENTITY torbirdy.prefs.extra2.button "Vekil Ayarlarını Sına"> <!ENTITY torbirdy.prefs.extra2.key "n"> <!ENTITY torbirdy.prefs.proxy.label "Proxy Ayarları"> -<!ENTITY torbirdy.prefs.privacy.label "Mahremiyet Ayarları"> +<!ENTITY torbirdy.prefs.privacy.label "Gizlilik Ayarları"> <!ENTITY torbirdy.prefs.enigmail.label "Enigmail Ayarları"> <!ENTITY torbirdy.prefs.security.label "Güvenlik Ayarları"> <!ENTITY torbirdy.prefs.recommended.text "TorBirdy(Tor) için önerilen proxy ayarlarını kullan"> @@ -34,15 +35,15 @@ <!ENTITY torbirdy.prefs.torification.key "t"> <!ENTITY torbirdy.prefs.global "Küresel"> <!ENTITY torbirdy.prefs.imap.label "IMAP hesapları için Push E-mail teknolojisini aktifleştir [varsayılan: pasif]"> -<!ENTITY torbirdy.prefs.imap.key "i"> +<!ENTITY torbirdy.prefs.imap.key "p"> <!ENTITY torbirdy.prefs.startup_folder.label "Başlangıçta, son erişilen posta klasörünü seç [varsayılan: pasif, yerel klasörleri seç]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Thunderbird'ün zaman dilimi olarak UTC'yi ayarlama [varsayılan: UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Alıcı anahtar ID'lerini şifrelenmiş mesajların içine koy [varsayılan: koyma]"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "p"> <!ENTITY torbirdy.prefs.confirmemail.label "Eğer Enigmail etkin ise email yollamadan önce onayla [default: do not confirm]"> -<!ENTITY torbirdy.prefs.confirmemail.key "m"> +<!ENTITY torbirdy.prefs.confirmemail.key "c"> <!ENTITY torbirdy.prefs.emailwizard.label "Thunderbird'ün otomatik eposta ayarı sihirbazını aktifleştir [varsayılan: pasif]"> <!ENTITY torbirdy.prefs.emailwizard.key "w"> <!ENTITY torbirdy.prefs.renegotiation.label "Güvenli renegotiation ile SSL/TLS desteklemeyen sunuculara erişime izin ver [varsayılan: izin verme]">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 23 Aug '13

23 Aug '13

commit e6caa9e50518267141bb82989009e91aab43d49b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 23 01:46:33 2013 +0000 Update translations for torbirdy --- tr/torbirdy.dtd | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tr/torbirdy.dtd b/tr/torbirdy.dtd index 9a0e35a..e4cca50 100644 --- a/tr/torbirdy.dtd +++ b/tr/torbirdy.dtd @@ -1,11 +1,10 @@ -<!ENTITY torbirdy.accountprefs.title "Hesap Konfigürasyonu"> -<!ENTITY torbirdy.accountprefs.startup.label "Yeni mesajlara başlangıçta bak"> +<!ENTITY torbirdy.accountprefs.title "Hesap Yapılandırması"> +<!ENTITY torbirdy.accountprefs.startup.label "Başlangıçta yeni iletileri denetle"> <!ENTITY torbirdy.accountprefs.startup.key "C"> -<!ENTITY torbirdy.accountprefs.minutes.label "Yeni mesajlara her XX de bak"> +<!ENTITY torbirdy.accountprefs.minutes.label "Yeni ileti denetleme süresi"> <!ENTITY torbirdy.accountprefs.minutes.key "y"> -<!ENTITY torbirdy.accountprefs.minutes.trail.label "dakikalar"> -<!ENTITY torbirdy.accountprefs.cancel.button "İptal - "> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "dakika"> +<!ENTITY torbirdy.accountprefs.cancel.button "İptal"> <!ENTITY torbirdy.accountprefs.save.button "Kaydet"> <!ENTITY torbirdy.accountprefs.save.key "S"> @@ -16,10 +15,10 @@ "> <!ENTITY torbirdy.prefs.extra1.button "Varsayılanı ayarla"> <!ENTITY torbirdy.prefs.extra1.key "d"> -<!ENTITY torbirdy.prefs.extra2.button ""> +<!ENTITY torbirdy.prefs.extra2.button "Vekil Ayarlarını Sına"> <!ENTITY torbirdy.prefs.extra2.key "n"> <!ENTITY torbirdy.prefs.proxy.label "Proxy Ayarları"> -<!ENTITY torbirdy.prefs.privacy.label "Mahremiyet Ayarları"> +<!ENTITY torbirdy.prefs.privacy.label "Gizlilik Ayarları"> <!ENTITY torbirdy.prefs.enigmail.label "Enigmail Ayarları"> <!ENTITY torbirdy.prefs.security.label "Güvenlik Ayarları"> <!ENTITY torbirdy.prefs.recommended.text "TorBirdy(Tor) için önerilen proxy ayarlarını kullan"> @@ -44,7 +43,7 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Alıcı anahtar ID'lerini şifrelenmiş mesajların içine koy [varsayılan: koyma]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "p"> <!ENTITY torbirdy.prefs.confirmemail.label "Eğer Enigmail etkin ise email yollamadan önce onayla [default: do not confirm]"> -<!ENTITY torbirdy.prefs.confirmemail.key ""> +<!ENTITY torbirdy.prefs.confirmemail.key "c"> <!ENTITY torbirdy.prefs.emailwizard.label "Thunderbird'ün otomatik eposta ayarı sihirbazını aktifleştir [varsayılan: pasif]"> <!ENTITY torbirdy.prefs.emailwizard.key "w"> <!ENTITY torbirdy.prefs.renegotiation.label "Güvenli renegotiation ile SSL/TLS desteklemeyen sunuculara erişime izin ver [varsayılan: izin verme]">

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 23 Aug '13

23 Aug '13

commit 6187d696f7d98836c0beb27d7c2ec7fd51e757a5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 23 01:45:34 2013 +0000 Update translations for vidalia_alpha_completed --- tr/vidalia_tr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/vidalia_tr.po b/tr/vidalia_tr.po index 0fdfd09..3ce38ee 100644 --- a/tr/vidalia_tr.po +++ b/tr/vidalia_tr.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2013-08-20 08:30+0000\n" +"PO-Revision-Date: 2013-08-23 01:30+0000\n" "Last-Translator: sgtpepper <barlasmirc(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 23 Aug '13

23 Aug '13

commit 7ff6ad67e625415c1b6e1631afed2bb617b8b1ee Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 23 01:45:31 2013 +0000 Update translations for vidalia_alpha --- tr/vidalia_tr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/vidalia_tr.po b/tr/vidalia_tr.po index 0fdfd09..3ce38ee 100644 --- a/tr/vidalia_tr.po +++ b/tr/vidalia_tr.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2013-08-20 08:30+0000\n" +"PO-Revision-Date: 2013-08-23 01:30+0000\n" "Last-Translator: sgtpepper <barlasmirc(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 23 Aug '13

23 Aug '13

commit b0ac58e9e8c1f89c48cbe4548264f886cbdfb03d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 23 01:45:27 2013 +0000 Update translations for vidalia_completed --- tr/qt_tr.po | 2 +- tr/vidalia_tr.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tr/qt_tr.po b/tr/qt_tr.po index 27401aa..f0f3629 100644 --- a/tr/qt_tr.po +++ b/tr/qt_tr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2013-08-21 08:50+0000\n" +"PO-Revision-Date: 2013-08-23 01:30+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n" diff --git a/tr/vidalia_tr.po b/tr/vidalia_tr.po index 674f5ba..8c6c11b 100644 --- a/tr/vidalia_tr.po +++ b/tr/vidalia_tr.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2013-08-20 08:30+0000\n" +"PO-Revision-Date: 2013-08-23 01:30+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 23 Aug '13

23 Aug '13

commit 6bd898375560d900316f27fbe267b15b73f44391 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 23 01:45:22 2013 +0000 Update translations for vidalia --- tr/qt_tr.po | 2 +- tr/vidalia_tr.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tr/qt_tr.po b/tr/qt_tr.po index 27401aa..f0f3629 100644 --- a/tr/qt_tr.po +++ b/tr/qt_tr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2013-08-21 08:50+0000\n" +"PO-Revision-Date: 2013-08-23 01:30+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n" diff --git a/tr/vidalia_tr.po b/tr/vidalia_tr.po index 674f5ba..8c6c11b 100644 --- a/tr/vidalia_tr.po +++ b/tr/vidalia_tr.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2013-08-20 08:30+0000\n" +"PO-Revision-Date: 2013-08-23 01:30+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] Merge remote-tracking branch 'public/bug9564' into maint-0.2.3
by nickm＠torproject.org 23 Aug '13

23 Aug '13

commit 8bf2892f51eb15dcba2a174968efa3cb12d5b6b6 Merge: 64410cc 2530c84 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 22 20:46:40 2013 -0400 Merge remote-tracking branch 'public/bug9564' into maint-0.2.3 changes/bug9564 | 5 +++++ src/or/networkstatus.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Replace return with continue in update_consensus_networkstatus_downloads
by nickm＠torproject.org 23 Aug '13

23 Aug '13

commit 2530c842207ecbec0d178fa5ce804a61a1c6ec6c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 22 10:00:37 2013 -0400 Replace return with continue in update_consensus_networkstatus_downloads Fix for bug 9564; bugfix on 0.2.3.14-alpha. --- changes/bug9564 | 5 +++++ src/or/networkstatus.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug9564 b/changes/bug9564 new file mode 100644 index 0000000..0df00e3 --- /dev/null +++ b/changes/bug9564 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - If the time to download the next old-style networkstatus is in + the future, do not decline to consider whether to download the + next microdescriptor networkstatus. Fixes bug 9564. Bugfix on + 0.2.3.14-alpha. diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 2553a74..e780ead 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1239,7 +1239,7 @@ update_consensus_networkstatus_downloads(time_t now) } if (time_to_download_next_consensus[i] > now) - return; /* Wait until the current consensus is older. */ + continue; /* Wait until the current consensus is older. */ resource = networkstatus_get_flavor_name(i);

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 23 Aug '13

23 Aug '13

commit 223c7da080713691531817bbf8b61589aa0a67ff Merge: eb79dd4 43f187e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 22 20:47:23 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug9564 | 5 +++++ src/or/networkstatus.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0