November 2015 - tor-commits - lists.torproject.org

[metrics-lib/master] Add new Ant tasks for putting out releases.
by karsten＠torproject.org 27 Nov '15

27 Nov '15

commit 1cfe054501ceb4758052a44ed199e0fbc6423c67 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Nov 27 17:14:50 2015 +0100 Add new Ant tasks for putting out releases. Again based on feedback by iwakeh on #13166. --- .gitignore | 4 ++- CERT | 18 +++++++++++++ LICENSE | 4 +-- build.xml | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++------- 4 files changed, 99 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index b57524b..ff410d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ classes/ lib/ -descriptor.jar +descriptor-*.jar +descriptor-*.tar.gz .classpath .project +build.properties diff --git a/CERT b/CERT new file mode 100644 index 0000000..3683158 --- /dev/null +++ b/CERT @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIDbTCCAlWgAwIBAgIEOUQZDTANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQGEwJVUzELMAkGA1UE +CBMCTUExEjAQBgNVBAcTCUNhbWJyaWRnZTEdMBsGA1UEChMUVGhlIFRvciBQcm9qZWN0LCBJbmMx +GDAWBgNVBAMTD0thcnN0ZW4gTG9lc2luZzAeFw0xNTExMjAxMTUzNTFaFw0xNjAyMTgxMTUzNTFa +MGcxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNQTESMBAGA1UEBxMJQ2FtYnJpZGdlMR0wGwYDVQQK +ExRUaGUgVG9yIFByb2plY3QsIEluYzEYMBYGA1UEAxMPS2Fyc3RlbiBMb2VzaW5nMIIBIjANBgkq +hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgJCqHFgEhyj8AI4w93YcyZEkKwn2Jw5t7bYcaLieP0wa +Ai2xrRFROo0eofjIllPlYTFtj9jLAZf+MQ1/Sdv7SLdlpasBCS0deTGlxuMzyMP9ztkkkAeibc+F +IXYPJArwGJiycnd+obW8b8KNrJQsnb0Se5Fdgo/PSu1rqMh/Mylv9vLqUzB4hbN4bg5+7THlTAOK +egYyR0NEPDzi327MAvzzle27kXV9yOCQr01zXW9NeWYed6JMXCZwaMN6nTVEFiwTfAyATfPncarf +gZ1kyAkQ6/Sw2bGMv8jHqB63Ka0/6GXHRbFgCeWU+c/1sfEMBD3ZurEjwSjWGl73E4GBswIDAQAB +oyEwHzAdBgNVHQ4EFgQUJbu6UT97IU4utjyc4zYUrLIgzvQwDQYJKoZIhvcNAQELBQADggEBADT/ +QEbkx0tVKWWkeahVBt76LG50iO0OQ5dP3SCdhZoudt7jIFifrAcGlOG6vAKXT6/dAhDkKiKXzxQo +8mt3wdkN4sIZDuXroJ+42s6ZED2L1HP6/daLlwaAfnx0b9LAAGKF7CMqxgPpiqiJ3K4LB4I1kFRJ +uzjy+/XTOR9aF5o0AGAb5jMmv/BtVu2cH+UgixH/FVhyfZekja2OAN/N2VE0BuzJEDApEJ9p9j5I +CRzeAuvOGT1CIEJR/fAuM5WZN6rD8nB7zwGCZP/RKvRdw0m89wMvHnvRvPZchSVf2PNoNy2GoqN6 +nWsS1VYgwYfyGV+br7U+YKCoKTKJ1jRxpAs= +-----END CERTIFICATE----- diff --git a/LICENSE b/LICENSE index d5b67cd..9040894 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2011 The Tor Project +Copyright 2011--2015 The Tor Project Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -12,7 +12,7 @@ met: in the documentation and/or other materials provided with the distribution. - * Neither the names of the copyright owners nor the names of its +* Neither the names of the copyright owners nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/build.xml b/build.xml index 4aaf8f7..e80109d 100644 --- a/build.xml +++ b/build.xml @@ -1,27 +1,37 @@ <project default="jar" name="descriptor" basedir="."> + <property name="release.version" value="1.0.0" /> <property name="sources" value="src"/> <property name="classes" value="classes"/> <property name="tests" value="test"/> - <property name="jarfile" value="descriptor.jar" /> + <property name="libs" value="lib"/> + <property name="jarfile" value="descriptor-${release.version}.jar" /> + <property name="jarsourcesfile" + value="descriptor-${release.version}-sources.jar" /> <property name="source-and-target-java-version" value="1.6" /> + <property name="release.tarball" + value="descriptor-${release.version}.tar.gz" /> + <property file="build.properties" /> <path id="classpath"> <pathelement path="${classes}"/> - <fileset dir="/usr/share/java"> + <fileset dir="${libs}"> <include name="commons-compress-1.4.1.jar"/> <include name="junit4-4.10.jar"/> + <include name="hamcrest-core-1.2.jar"/> </fileset> </path> - <target name="init"> - <mkdir dir="${classes}"/> - </target> - <target name="clean" > <delete includeEmptyDirs="true"> <fileset dir="${classes}" defaultexcludes="false" includes="**" /> </delete> <delete file="${jarfile}"/> + <delete file="${jarsourcesfile}"/> + <delete file="${release.tarball}"/> + </target> + + <target name="init"> + <mkdir dir="${classes}"/> </target> <target name="compile" @@ -38,10 +48,7 @@ <classpath refid="classpath"/> </javac> </target> - <target name="jar" depends="compile"> - <jar destfile="${jarfile}" - basedir="${classes}"/> - </target> + <target name="test" depends="compile"> <javac destdir="${classes}" srcdir="${tests}" @@ -63,5 +70,64 @@ </batchtest> </junit> </target> + + <target name="jar" depends="compile"> + <exec executable="git" outputproperty="git.revision"> + <arg value="rev-parse" /> + <arg value="--short" /> + <arg value="HEAD" /> + </exec> + <jar destfile="${jarfile}" + basedir="${classes}"> + <manifest> + <attribute name="Created-By" value="The Tor Project" /> + <attribute name="Implementation-Title" value="DescripTor"/> + <attribute name="Implementation-Version" + value="${release.version}-${git.revision}"/> + </manifest> + </jar> + <jar destfile="${jarsourcesfile}"> + <fileset dir="${sources}" /> + <fileset dir="${tests}"/> + <manifest> + <attribute name="Created-By" value="The Tor Project" /> + <attribute name="Implementation-Title" value="DescripTor"/> + <attribute name="Implementation-Version" + value="${release.version}-${git.revision}"/> + </manifest> + </jar> + </target> + + <target name="signjar" depends="jar"> + <signjar alias="${jarsigner.alias}" + storepass="${jarsigner.storepass}" + sigalg="SHA256withRSA" + digestalg="SHA-256" + tsaurl="http://timestamp.digicert.com"> + <path> + <pathelement path="${jarfile}"/> + <pathelement path="${jarsourcesfile}"/> + </path> + </signjar> + </target> + + <target name="tar" depends="signjar"> + <tar destfile="${release.tarball}" compression="gzip"> + <tarfileset dir="." prefix="descriptor-${release.version}"> + <include name="${jarfile}" /> + <include name="${jarsourcesfile}" /> + <include name="build.xml" /> + <include name="LICENSE" /> + <include name="CERT" /> + <include name="*.md" /> + </tarfileset> + <tarfileset dir="${sources}" + prefix="descriptor-${release.version}/src" /> + <tarfileset dir="${tests}" + prefix="descriptor-${release.version}/test" /> + <tarfileset dir="${libs}" + prefix="descriptor-${release.version}/lib" /> + </tar> + </target> </project>

1 0

[metrics-lib/master] Change version to 0.0.1-dev until the first release.
by karsten＠torproject.org 27 Nov '15

27 Nov '15

commit b1e5ab42c40670043cdb0385c919c19a97d2756f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Nov 27 17:17:32 2015 +0100 Change version to 0.0.1-dev until the first release. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index e80109d..eb043db 100644 --- a/build.xml +++ b/build.xml @@ -1,5 +1,5 @@ <project default="jar" name="descriptor" basedir="."> - <property name="release.version" value="1.0.0" /> + <property name="release.version" value="0.0.1-dev" /> <property name="sources" value="src"/> <property name="classes" value="classes"/> <property name="tests" value="test"/>

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 27 Nov '15

27 Nov '15

commit 7e2282aa5d47bd4def0fcaf2c272f885aedda714 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 27 03:45:04 2015 +0000 Update translations for bridgedb --- th/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/th/LC_MESSAGES/bridgedb.po b/th/LC_MESSAGES/bridgedb.po index e1c1e91..13e57f2 100644 --- a/th/LC_MESSAGES/bridgedb.po +++ b/th/LC_MESSAGES/bridgedb.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2015-11-25 14:46+0000\n" +"PO-Revision-Date: 2015-11-27 03:24+0000\n" "Last-Translator: Ella Rudland <atwwtkp(a)gmail.com>\n" "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n" "MIME-Version: 1.0\n" @@ -280,7 +280,7 @@ msgstr "บริดจ์ไม่ทำงาน ต้องการคว #: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "" +msgstr " ถ้า Tor ของท่านไม่สามารถทำงานได้กรุณาส่งอีเมล %s ให้ทราบ" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser".

1 0

[tor/master] improve log messages to try to track down #17659
by nickm＠torproject.org 26 Nov '15

26 Nov '15

commit 0c7bfb206ea14ea3115c1b8b214ec79f5e6694e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 26 12:44:12 2015 -0500 improve log messages to try to track down #17659 --- src/or/connection_edge.c | 14 +++++++++----- src/or/connection_edge.h | 5 ++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index aad1ea4..496fe21 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -800,8 +800,10 @@ connection_ap_attach_pending(int retry) continue; } if (conn->state != AP_CONN_STATE_CIRCUIT_WAIT) { - log_warn(LD_BUG, "%p is no longer in circuit_wait. Why is it on " - "pending_entry_connections?", entry_conn); + log_warn(LD_BUG, "%p is no longer in circuit_wait. Its current state " + "is %s. Why is it on pending_entry_connections?", + entry_conn, + conn_state_to_string(conn->type, conn->state)); SMARTLIST_DEL_CURRENT(pending_entry_connections, entry_conn); continue; } @@ -831,7 +833,8 @@ connection_ap_attach_pending(int retry) * call connection_ap_attach_pending(). */ void -connection_ap_mark_as_pending_circuit(entry_connection_t *entry_conn) +connection_ap_mark_as_pending_circuit_(entry_connection_t *entry_conn, + const char *fname, int lineno) { connection_t *conn = ENTRY_TO_CONN(entry_conn); tor_assert(conn->state == AP_CONN_STATE_CIRCUIT_WAIT); @@ -843,8 +846,9 @@ connection_ap_mark_as_pending_circuit(entry_connection_t *entry_conn) if (PREDICT_UNLIKELY(smartlist_contains(pending_entry_connections, entry_conn))) { - log_warn(LD_BUG, "What?? pending_entry_connections already contains %p!", - entry_conn); + log_warn(LD_BUG, "What?? pending_entry_connections already contains %p! " + "(called from %s:%d)", + entry_conn, fname, lineno); return; } diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h index 521e759..90cf2a3 100644 --- a/src/or/connection_edge.h +++ b/src/or/connection_edge.h @@ -66,7 +66,10 @@ int connection_ap_can_use_exit(const entry_connection_t *conn, void connection_ap_expire_beginning(void); void connection_ap_rescan_and_attach_pending(void); void connection_ap_attach_pending(int retry); -void connection_ap_mark_as_pending_circuit(entry_connection_t *entry_conn); +void connection_ap_mark_as_pending_circuit_(entry_connection_t *entry_conn, + const char *file, int line); +#define connection_ap_mark_as_pending_circuit(c) \ + connection_ap_mark_as_pending_circuit_((c), __FILE__, __LINE__) void connection_ap_fail_onehop(const char *failed_digest, cpath_build_state_t *build_state); void circuit_discard_optional_exit_enclaves(extend_info_t *info);

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 26 Nov '15

26 Nov '15

commit d809af30b0aee65185f76941a6a6b562c77aee6d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 26 16:15:52 2015 +0000 Update translations for abouttor-homepage_completed --- is/aboutTor.dtd | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/is/aboutTor.dtd b/is/aboutTor.dtd new file mode 100644 index 0000000..cfa4273 --- /dev/null +++ b/is/aboutTor.dtd @@ -0,0 +1,49 @@ + + +<!ENTITY aboutTor.title "Um Tor"> + +<!ENTITY aboutTor.outOfDateTorOn.label "HINSVEGAR, er þessi vafri úreltur."> +<!ENTITY aboutTor.outOfDateTorOff.label "ENNFREMUR, er þessi vafri úreltur."> +<!ENTITY aboutTor.outOfDate2.label "Smelltu á laukinn og veldu að athuga með uppfærslur fyrir Tor-vafrann."> + +<!ENTITY aboutTor.check.label "Prófa netkerfisstillingar Tor"> + +<!ENTITY aboutTor.success.label "Til hamingju!"> +<!ENTITY aboutTor.success2.label "Þessi vafri er stilltur til að nota Tor."> +<!ENTITY aboutTor.success3.label "Núna geturðu vafrað nafnlaust um netið."> +<!ENTITY aboutTor.failure.label "Eitthvað fór úrskeiðis!"> +<!ENTITY aboutTor.failure2.label "Tor virkar ekki í þessum vafra."> +<!ENTITY aboutTor.failure3prefix.label "Til að fá hjálp, hafðu samband við"> +<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> +<!ENTITY aboutTor.failure3suffix.label "."> + +<!ENTITY aboutTor.search.label "Leita"> + +<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> +<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> +<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> + +<!ENTITY aboutTor.torInfo1.label "Aukaupplýsingar:"> +<!ENTITY aboutTor.torInfo2.label "Land og IP-tala:"> +<!ENTITY aboutTor.torInfo3.label "Útgangspunktur:"> +<!ENTITY aboutTor.torInfo4.label "Þessi þjónn skráir ekki neinar upplýsingar um notendur."> +<!ENTITY aboutTor.whatnextQuestion.label "Hvað svo?"> +<!ENTITY aboutTor.whatnextAnswer.label "Tor er EKKI það eina sem þú þarft til að vafra nafnlaust á netinu! Þú gætir þurft að breyta einhverju af venjum þínum við vafur til að halda auðkennum þínum öruggum."> +<!ENTITY aboutTor.whatnext.label "Góð ráð til að halda nafnleysi »"> +<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.helpInfo1.label "Þú getur hjálpað!"> +<!ENTITY aboutTor.helpInfo2.label "Þú getur hjálpað til á marga vegu til að gera Tor-netið hraðvirkara og sterkara."> +<!ENTITY aboutTor.helpInfo3.label "Keyrðu Tor-endurvarpa (relay node) »"> +<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> +<!ENTITY aboutTor.helpInfo4.label "Bjóddu fram krafta þína »"> +<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> +<!ENTITY aboutTor.helpInfo5.label "Gefðu til verkefnisins »"> +<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> + +<!ENTITY aboutTor.footer.label "Tor-verkefnið eru samtök án ágóðamarkmiðs (US 501(c)(3) ) sem helga sig rannsóknum, þróun og menntun varðandi einkagagnaleynd og nafnleysi á netinu."> +<!ENTITY aboutTor.learnMore.label "Lærðu meira um Tor-verkefnið »"> +<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 26 Nov '15

26 Nov '15

commit 03107391ccae5671536dc803dc31e82886d3d3cc Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 26 16:15:48 2015 +0000 Update translations for abouttor-homepage --- is/aboutTor.dtd | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/is/aboutTor.dtd b/is/aboutTor.dtd index 2340191..cfa4273 100644 --- a/is/aboutTor.dtd +++ b/is/aboutTor.dtd @@ -6,18 +6,18 @@ <!ENTITY aboutTor.title "Um Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update."> +<!ENTITY aboutTor.outOfDateTorOn.label "HINSVEGAR, er þessi vafri úreltur."> +<!ENTITY aboutTor.outOfDateTorOff.label "ENNFREMUR, er þessi vafri úreltur."> +<!ENTITY aboutTor.outOfDate2.label "Smelltu á laukinn og veldu að athuga með uppfærslur fyrir Tor-vafrann."> -<!ENTITY aboutTor.check.label "Test Tor Network Settings"> +<!ENTITY aboutTor.check.label "Prófa netkerfisstillingar Tor"> <!ENTITY aboutTor.success.label "Til hamingju!"> -<!ENTITY aboutTor.success2.label "This browser is configured to use Tor."> -<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously."> -<!ENTITY aboutTor.failure.label "Something Went Wrong!"> -<!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> -<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact "> +<!ENTITY aboutTor.success2.label "Þessi vafri er stilltur til að nota Tor."> +<!ENTITY aboutTor.success3.label "Núna geturðu vafrað nafnlaust um netið."> +<!ENTITY aboutTor.failure.label "Eitthvað fór úrskeiðis!"> +<!ENTITY aboutTor.failure2.label "Tor virkar ekki í þessum vafra."> +<!ENTITY aboutTor.failure3prefix.label "Til að fá hjálp, hafðu samband við"> <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> <!ENTITY aboutTor.failure3suffix.label "."> @@ -27,23 +27,23 @@ <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> -<!ENTITY aboutTor.torInfo1.label "Additional Info:"> -<!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> -<!ENTITY aboutTor.torInfo3.label "Exit Node:"> -<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> -<!ENTITY aboutTor.whatnextQuestion.label "What Next?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> -<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »"> +<!ENTITY aboutTor.torInfo1.label "Aukaupplýsingar:"> +<!ENTITY aboutTor.torInfo2.label "Land og IP-tala:"> +<!ENTITY aboutTor.torInfo3.label "Útgangspunktur:"> +<!ENTITY aboutTor.torInfo4.label "Þessi þjónn skráir ekki neinar upplýsingar um notendur."> +<!ENTITY aboutTor.whatnextQuestion.label "Hvað svo?"> +<!ENTITY aboutTor.whatnextAnswer.label "Tor er EKKI það eina sem þú þarft til að vafra nafnlaust á netinu! Þú gætir þurft að breyta einhverju af venjum þínum við vafur til að halda auðkennum þínum öruggum."> +<!ENTITY aboutTor.whatnext.label "Góð ráð til að halda nafnleysi »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.helpInfo1.label "You Can Help!"> -<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> -<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »"> +<!ENTITY aboutTor.helpInfo1.label "Þú getur hjálpað!"> +<!ENTITY aboutTor.helpInfo2.label "Þú getur hjálpað til á marga vegu til að gera Tor-netið hraðvirkara og sterkara."> +<!ENTITY aboutTor.helpInfo3.label "Keyrðu Tor-endurvarpa (relay node) »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »"> +<!ENTITY aboutTor.helpInfo4.label "Bjóddu fram krafta þína »"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Gefa til verkefnisins"> +<!ENTITY aboutTor.helpInfo5.label "Gefðu til verkefnisins »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> -<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> -<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »"> +<!ENTITY aboutTor.footer.label "Tor-verkefnið eru samtök án ágóðamarkmiðs (US 501(c)(3) ) sem helga sig rannsóknum, þróun og menntun varðandi einkagagnaleynd og nafnleysi á netinu."> +<!ENTITY aboutTor.learnMore.label "Lærðu meira um Tor-verkefnið »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 26 Nov '15

26 Nov '15

commit b7b0f32766b712817cc9acfcf2a8ee40d233e40e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 26 16:15:35 2015 +0000 Update translations for tor-launcher-properties --- is/torlauncher.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/is/torlauncher.properties b/is/torlauncher.properties index d6769bc..9a238cc 100644 --- a/is/torlauncher.properties +++ b/is/torlauncher.properties @@ -1,7 +1,7 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher +torlauncher.error_title=Tor-ræsir torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. @@ -35,7 +35,7 @@ torlauncher.quit=Hætta torlauncher.quit_win=Fara út torlauncher.done=Búið -torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance=Til að fá hjálp, hafðu samband við %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. @@ -48,13 +48,13 @@ torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information torlauncher.bootstrapStatus.loading_descriptors=Loading relay information torlauncher.bootstrapStatus.conn_or=Tengist Tor-netinu torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Connected to the Tor network! +torlauncher.bootstrapStatus.done=Tengdur við Tor-netið! torlauncher.bootstrapWarning.done=búið torlauncher.bootstrapWarning.connectrefused=tengingu hafnað torlauncher.bootstrapWarning.misc=ýmislegt torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch +torlauncher.bootstrapWarning.identity=auðkenni samsvara ekki torlauncher.bootstrapWarning.timeout=tenging féll á tíma torlauncher.bootstrapWarning.noroute=no route to host torlauncher.bootstrapWarning.ioerror=les/skrifvilla

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 26 Nov '15

26 Nov '15

commit dd16738b6a0df8afe8998b2866a3f419e09e5e90 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 26 16:15:08 2015 +0000 Update translations for torcheck --- is/torcheck.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/is/torcheck.po b/is/torcheck.po index 156d200..1d34a65 100644 --- a/is/torcheck.po +++ b/is/torcheck.po @@ -7,15 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-02-14 08:38+0000\n" +"PO-Revision-Date: 2015-11-26 15:53+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Icelandic (http://www.transifex.com/projects/p/torproject/language/is/)\n" +"Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: pygettext.py 1.5\n" "Language: is\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n" msgid "Congratulations. This browser is configured to use Tor." msgstr "Til hamingju. Þessi vafri er stilltur til að nota Tor." @@ -67,7 +67,7 @@ msgstr "" msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " "development, and education of online anonymity and privacy." -msgstr "" +msgstr "Tor-verkefnið eru samtök án ágóðamarkmiðs (US 501(c)(3) ) sem helga sig rannsóknum, þróun og menntun varðandi einkagagnaleynd og nafnleysi á netinu." msgid "Learn More »" msgstr "Læra meira"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 26 Nov '15

26 Nov '15

commit 10a7f7d92939dd02329e77ef6a25d871e2803e75 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 26 15:45:12 2015 +0000 Update translations for whisperback --- is/is.po | 97 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 49 insertions(+), 48 deletions(-) diff --git a/is/is.po b/is/is.po index b38874e..f3b3f8d 100644 --- a/is/is.po +++ b/is/is.po @@ -3,19 +3,20 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Sveinn í Felli <sv1(a)fellsnet.is>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-03-26 15:50+0100\n" -"PO-Revision-Date: 2012-02-26 16:11+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: Icelandic (http://www.transifex.com/projects/p/torproject/language/is/)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-03-17 17:40+0100\n" +"PO-Revision-Date: 2015-11-26 15:35+0000\n" +"Last-Translator: Sveinn í Felli <sv1(a)fellsnet.is>\n" +"Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: is\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n" #. XXX use a better exception #: ../whisperBack/whisperback.py:63 @@ -39,40 +40,40 @@ msgid "" "/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" msgstr "" -#: ../whisperBack/gui.py:151 +#: ../whisperBack/gui.py:154 msgid "Unable to load a valid configuration." msgstr "" -#: ../whisperBack/gui.py:217 +#: ../whisperBack/gui.py:220 msgid "Sending mail..." -msgstr "" +msgstr "Sendi póst..." -#: ../whisperBack/gui.py:218 +#: ../whisperBack/gui.py:221 msgid "Sending mail" -msgstr "" +msgstr "Sendi póst" #. pylint: disable=C0301 -#: ../whisperBack/gui.py:220 +#: ../whisperBack/gui.py:223 msgid "This could take a while..." -msgstr "" +msgstr "Þetta gæti tekið nokkra stund..." -#: ../whisperBack/gui.py:234 +#: ../whisperBack/gui.py:237 msgid "The contact email adress doesn't seem valid." msgstr "" -#: ../whisperBack/gui.py:251 +#: ../whisperBack/gui.py:254 msgid "Unable to send the mail: SMTP error." msgstr "" -#: ../whisperBack/gui.py:253 +#: ../whisperBack/gui.py:256 msgid "Unable to connect to the server." msgstr "" -#: ../whisperBack/gui.py:255 +#: ../whisperBack/gui.py:258 msgid "Unable to create or to send the mail." msgstr "" -#: ../whisperBack/gui.py:258 +#: ../whisperBack/gui.py:261 msgid "" "\n" "\n" @@ -81,21 +82,21 @@ msgid "" "If it does not work, you will be offered to save the bug report." msgstr "" -#: ../whisperBack/gui.py:271 +#: ../whisperBack/gui.py:274 msgid "Your message has been sent." -msgstr "" +msgstr "Skilaboðin þín voru send." -#: ../whisperBack/gui.py:278 +#: ../whisperBack/gui.py:281 msgid "An error occured during encryption." -msgstr "" +msgstr "Villa kom upp við dulritun." -#: ../whisperBack/gui.py:298 +#: ../whisperBack/gui.py:301 #, python-format msgid "Unable to save %s." -msgstr "" +msgstr "Gat ekki vistað %s." #. XXX: fix string -#: ../whisperBack/gui.py:322 +#: ../whisperBack/gui.py:325 #, python-format msgid "" "The bug report could not be sent, likely due to network problems.\n" @@ -105,37 +106,37 @@ msgid "" "Do you want to save the bug report to a file?" msgstr "" -#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21 +#: ../whisperBack/gui.py:389 ../data/whisperback.ui.h:21 msgid "WhisperBack" -msgstr "" +msgstr "WhisperBack" -#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2 +#: ../whisperBack/gui.py:390 ../data/whisperback.ui.h:2 msgid "Send feedback in an encrypted mail." -msgstr "" +msgstr "Senda umsögn í dulrituðum pósti" -#: ../whisperBack/gui.py:390 +#: ../whisperBack/gui.py:393 msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" -msgstr "" +msgstr "Höfundarréttur © 2009-2012 Tails hönnuðirnir (tails(a)boum.org)" -#: ../whisperBack/gui.py:391 +#: ../whisperBack/gui.py:394 msgid "Tails developers <tails(a)boum.org>" -msgstr "" +msgstr "Tails hönnuðirnir <tails(a)boum.org>" -#: ../whisperBack/gui.py:392 +#: ../whisperBack/gui.py:395 msgid "translator-credits" -msgstr "" +msgstr "Sveinn í Felli" -#: ../whisperBack/gui.py:419 +#: ../whisperBack/gui.py:422 msgid "This doesn't seem to be a valid URL or OpenPGP key." -msgstr "" +msgstr "Þetta lítur ekki út fyrir að vera gild URL-slóð eða OpenPGP-lykill." #: ../data/whisperback.ui.h:1 msgid "Copyright © 2009-2012 tails(a)boum.org" -msgstr "" +msgstr "Höfundarréttur © 2009-2012 tails(a)boum.org" #: ../data/whisperback.ui.h:3 msgid "https://tails.boum.org/" -msgstr "" +msgstr "https://tails.boum.org/" #: ../data/whisperback.ui.h:4 msgid "" @@ -154,7 +155,7 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "" +msgstr "WhisperBack - Senda umsögn í dulrituðum pósti\nHöfundarréttur (C) 2009-2012 Tails hönnuðirnir <tails(a)boum.org>\n\nÞetta er frjáls hugbúnaður; þú mátt dreifa honum og/eða breyta samkvæmt skilmálum í almenna GNU GPL notkunarleyfinu eins og það er gefið út af Frjálsu hugbúnaðarstofnuninni; annaðhvort útgáfu 3 af GPL-leyfinu, eða (ef þér sýnist svo) einhverja nýrri útgáfu leyfisins.\n\nHugbúnaðnum er dreift í þeirri von að hann geti verið gagnlegur, en ÁN ALLRAR ÁBYRGÐAR; einnig án þeirrar ábyrgðar sem gefin er í skyn með SELJANLEIKA eða EIGINLEIKUM TIL TILTEKINNA NOTA. Sjá almenna GNU GPL notkunarleyfið fyrir nánari upplýsingar.\n\nÞað ætti að hafa fylgt afrit af almenna GNU GPL notkunarleyfinu með forritinu; ef ekki, skoðaðu þá <http://www.gnu.org/licenses/>.\n\n" #: ../data/whisperback.ui.h:20 msgid "" @@ -164,31 +165,31 @@ msgstr "" #: ../data/whisperback.ui.h:22 msgid "Summary" -msgstr "" +msgstr "Samantekt" #: ../data/whisperback.ui.h:23 msgid "Bug description" -msgstr "" +msgstr "Lýsing á villu" #: ../data/whisperback.ui.h:24 msgid "Optional email address to contact you" -msgstr "" +msgstr "Valkvætt netfang svo hægt sé að hafa samband við þig" #: ../data/whisperback.ui.h:25 msgid "optional PGP key" -msgstr "" +msgstr "valkvæður PGP-lykill" #: ../data/whisperback.ui.h:26 msgid "Technical details to include" -msgstr "" +msgstr "Tæknileg atriði sem fylgja með" #: ../data/whisperback.ui.h:27 msgid "headers" -msgstr "" +msgstr "hausar" #: ../data/whisperback.ui.h:28 msgid "debugging info" -msgstr "" +msgstr "aflúsunarupplýsingar" #: ../data/whisperback.ui.h:29 msgid "Help" @@ -196,4 +197,4 @@ msgstr "Hjálp" #: ../data/whisperback.ui.h:30 msgid "Send" -msgstr "" +msgstr "Senda"

1 0

[tor/master] Unit test the full length of SHA256 and SHA512 digests
by nickm＠torproject.org 26 Nov '15

26 Nov '15

commit fc264975b15b7e6b731441a4363da53b3b28f415 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Fri Nov 27 02:25:31 2015 +1100 Unit test the full length of SHA256 and SHA512 digests Bugfix on a tor version before the refactoring in git commit cea12251995d (23 Sep 2009). Patch by "teor". --- changes/sha-unit-tests | 5 +++++ src/test/test_crypto.c | 39 ++++++++++++++++++++------------------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/changes/sha-unit-tests b/changes/sha-unit-tests new file mode 100644 index 0000000..457578d --- /dev/null +++ b/changes/sha-unit-tests @@ -0,0 +1,5 @@ + o Minor bugfixes (unit tests): + - Check the full results of SHA256 and SHA512 digests in the + unit tests. + Bugfix on a tor version before the refactoring in git commit + cea12251995d (23 Sep 2009). Patch by "teor". diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 9de14c2..a3bef2c 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -284,10 +284,11 @@ test_crypto_sha(void *arg) { crypto_digest_t *d1 = NULL, *d2 = NULL; int i; - char key[160]; - char digest[32]; - char data[50]; - char d_out1[DIGEST_LEN], d_out2[DIGEST512_LEN]; +#define RFC_4231_MAX_KEY_SIZE 131 + char key[RFC_4231_MAX_KEY_SIZE]; + char digest[DIGEST256_LEN]; + char data[DIGEST512_LEN]; + char d_out1[DIGEST512_LEN], d_out2[DIGEST512_LEN]; char *mem_op_hex_tmp=NULL; /* Test SHA-1 with a test vector from the specification. */ @@ -385,15 +386,15 @@ test_crypto_sha(void *arg) d2 = crypto_digest_dup(d1); tt_assert(d2); crypto_digest_add_bytes(d2, "ghijkl", 6); - crypto_digest_get_digest(d2, d_out1, sizeof(d_out1)); + crypto_digest_get_digest(d2, d_out1, DIGEST_LEN); crypto_digest(d_out2, "abcdefghijkl", 12); tt_mem_op(d_out1,OP_EQ, d_out2, DIGEST_LEN); crypto_digest_assign(d2, d1); crypto_digest_add_bytes(d2, "mno", 3); - crypto_digest_get_digest(d2, d_out1, sizeof(d_out1)); + crypto_digest_get_digest(d2, d_out1, DIGEST_LEN); crypto_digest(d_out2, "abcdefmno", 9); tt_mem_op(d_out1,OP_EQ, d_out2, DIGEST_LEN); - crypto_digest_get_digest(d1, d_out1, sizeof(d_out1)); + crypto_digest_get_digest(d1, d_out1, DIGEST_LEN); crypto_digest(d_out2, "abcdef", 6); tt_mem_op(d_out1,OP_EQ, d_out2, DIGEST_LEN); crypto_digest_free(d1); @@ -406,17 +407,17 @@ test_crypto_sha(void *arg) d2 = crypto_digest_dup(d1); tt_assert(d2); crypto_digest_add_bytes(d2, "ghijkl", 6); - crypto_digest_get_digest(d2, d_out1, sizeof(d_out1)); + crypto_digest_get_digest(d2, d_out1, DIGEST256_LEN); crypto_digest256(d_out2, "abcdefghijkl", 12, DIGEST_SHA256); - tt_mem_op(d_out1,OP_EQ, d_out2, DIGEST_LEN); + tt_mem_op(d_out1,OP_EQ, d_out2, DIGEST256_LEN); crypto_digest_assign(d2, d1); crypto_digest_add_bytes(d2, "mno", 3); - crypto_digest_get_digest(d2, d_out1, sizeof(d_out1)); + crypto_digest_get_digest(d2, d_out1, DIGEST256_LEN); crypto_digest256(d_out2, "abcdefmno", 9, DIGEST_SHA256); - tt_mem_op(d_out1,OP_EQ, d_out2, DIGEST_LEN); - crypto_digest_get_digest(d1, d_out1, sizeof(d_out1)); + tt_mem_op(d_out1,OP_EQ, d_out2, DIGEST256_LEN); + crypto_digest_get_digest(d1, d_out1, DIGEST256_LEN); crypto_digest256(d_out2, "abcdef", 6, DIGEST_SHA256); - tt_mem_op(d_out1,OP_EQ, d_out2, DIGEST_LEN); + tt_mem_op(d_out1,OP_EQ, d_out2, DIGEST256_LEN); crypto_digest_free(d1); crypto_digest_free(d2); @@ -427,17 +428,17 @@ test_crypto_sha(void *arg) d2 = crypto_digest_dup(d1); tt_assert(d2); crypto_digest_add_bytes(d2, "ghijkl", 6); - crypto_digest_get_digest(d2, d_out1, sizeof(d_out1)); + crypto_digest_get_digest(d2, d_out1, DIGEST512_LEN); crypto_digest512(d_out2, "abcdefghijkl", 12, DIGEST_SHA512); - tt_mem_op(d_out1,OP_EQ, d_out2, DIGEST_LEN); + tt_mem_op(d_out1,OP_EQ, d_out2, DIGEST512_LEN); crypto_digest_assign(d2, d1); crypto_digest_add_bytes(d2, "mno", 3); - crypto_digest_get_digest(d2, d_out1, sizeof(d_out1)); + crypto_digest_get_digest(d2, d_out1, DIGEST512_LEN); crypto_digest512(d_out2, "abcdefmno", 9, DIGEST_SHA512); - tt_mem_op(d_out1,OP_EQ, d_out2, DIGEST_LEN); - crypto_digest_get_digest(d1, d_out1, sizeof(d_out1)); + tt_mem_op(d_out1,OP_EQ, d_out2, DIGEST512_LEN); + crypto_digest_get_digest(d1, d_out1, DIGEST512_LEN); crypto_digest512(d_out2, "abcdef", 6, DIGEST_SHA512); - tt_mem_op(d_out1,OP_EQ, d_out2, DIGEST_LEN); + tt_mem_op(d_out1,OP_EQ, d_out2, DIGEST512_LEN); done: if (d1)

1 0