March 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 19 Mar '18

19 Mar '18

commit 19421ffcf3fef22bd221279afceb137354d0a3bf Merge: f5f4a6861 910422e8f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 19 16:59:49 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/test/test_hs_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 19 Mar '18

19 Mar '18

commit 910422e8fae173f061d016c72eecc2015a09537e Merge: 85719b79b 66d312063 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 19 16:59:49 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/test/test_hs_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[collector/master] Include webstats in create-tarballs.sh.
by karsten＠torproject.org 19 Mar '18

19 Mar '18

commit 4e166b7832a8026690950ca8f8e971998b3a0bcb Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Mar 19 20:59:34 2018 +0100 Include webstats in create-tarballs.sh. --- src/main/resources/create-tarballs.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/resources/create-tarballs.sh b/src/main/resources/create-tarballs.sh index c20303e..cd16b2d 100755 --- a/src/main/resources/create-tarballs.sh +++ b/src/main/resources/create-tarballs.sh @@ -105,8 +105,15 @@ for (( i = 0 ; i < ${#TARBALLS[@]} ; i++ )); do fi done +cd $OUTDIR/webstats/ +echo `date` "Creating webstats-"$YEARONE"-"$MONTHONE".tar" +find . -type f | grep "/"$YEARONE"/"$MONTHONE"/" | cut -c3- | tar cf $WORKDIR/webstats-$YEARONE-$MONTHONE.tar --transform 's,^,webstats-'$YEARONE'-'$MONTHONE'/,' -T - +echo `date` "Creating webstats-"$YEARTWO"-"$MONTHTWO".tar" +find . -type f | grep "/"$YEARTWO"/"$MONTHTWO"/" | cut -c3- | tar cf $WORKDIR/webstats-$YEARTWO-$MONTHTWO.tar --transform 's,^,webstats-'$YEARTWO'-'$MONTHTWO'/,' -T - +cd $WORKDIR + echo `date` "Moving tarballs into place" -mv *.tar.xz $TARBALLTARGETDIR +mv *.tar* $TARBALLTARGETDIR cd $CURRENTPATH @@ -154,4 +161,7 @@ ln -f -s -t $ARCHIVEDIR/relay-descriptors/votes/ $TARBALLTARGETDIR/votes-20??-?? mkdir -p $ARCHIVEDIR/torperf/ ln -f -s -t $ARCHIVEDIR/torperf/ $TARBALLTARGETDIR/torperf-20??-??.tar.xz +mkdir -p $ARCHIVEDIR/webstats/ +ln -f -s -t $ARCHIVEDIR/webstats/ $TARBALLTARGETDIR/webstats-20??-??.tar + echo `date` "Finished."

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 19 Mar '18

19 Mar '18

commit 778c29ba79bfbfb14fdba36c12cf1683bb1f2e35 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 19 18:16:45 2018 +0000 Update translations for tails-misc --- he.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/he.po b/he.po index e88f16d4c..2004946cc 100644 --- a/he.po +++ b/he.po @@ -5,7 +5,7 @@ # Translators: # Dvir Rosen <ndvnis(a)gmail.com>, 2014 # GenghisKhan <genghiskhan(a)gmx.ca>, 2013 -# ION, 2017 +# ION, 2017-2018 # Johnny Diralenzo, 2015 # Kunda, 2014 # Ruben <drarbib(a)gmail.com>, 2014 @@ -14,8 +14,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-03-12 19:03+0100\n" -"PO-Revision-Date: 2018-03-13 02:48+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2018-03-19 18:04+0000\n" +"Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -112,7 +112,7 @@ msgstr "בלתי זמין" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:170 msgid "Your additional software installation failed" -msgstr "" +msgstr "ההתקנה של התוכנה הנוספת שלך נכשלה" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:171 msgid "" @@ -122,16 +122,16 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:177 msgid "Your additional software are installed" -msgstr "" +msgstr "התוכנה הנוספת שלך הותקנה" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:178 msgid "Your additional software are ready to use." -msgstr "" +msgstr "התוכנה הנוספת שלך מוכנה לשימוש." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:194 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:204 msgid "Your additional software upgrade failed" -msgstr "" +msgstr "שדרוג התוכנה הנוספת שלך נכשל" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:195 msgid "" @@ -142,7 +142,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:201 msgid "Your additional software are up to date" -msgstr "" +msgstr "התוכנה הנוספת שלך מעודכנת" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:202 msgid "The upgrade was successful." @@ -211,11 +211,11 @@ msgstr "ביטול" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:124 msgid "Screen Locker" -msgstr "" +msgstr "נועל המסך" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:130 msgid "Set up a password to unlock the screen." -msgstr "" +msgstr "קבע סיסמה לביטול נעילת המסך." #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:135 msgid "Password"

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 19 Mar '18

19 Mar '18

commit a5872a0256661985e30f4892aa71dca062007f2b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 19 18:16:39 2018 +0000 Update translations for tor-launcher-network-settings_completed --- he/network-settings.dtd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/he/network-settings.dtd b/he/network-settings.dtd index a40576cae..f11c418f9 100644 --- a/he/network-settings.dtd +++ b/he/network-settings.dtd @@ -41,6 +41,10 @@ <!ENTITY torsettings.useBridges.checkbox "Tor מצונזר במדינה שלי"> <!ENTITY torsettings.useBridges.default "בחר גשר מובנה"> <!ENTITY torsettings.useBridges.default.placeholder "בחר גשר"> +<!ENTITY torsettings.useBridges.bridgeDB "בקש גשר מן torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "הכנס את התווים מהתמונה"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "קבל אתגר חדש"> +<!ENTITY torsettings.useBridges.captchaSubmit "הגש"> <!ENTITY torsettings.useBridges.custom "סַפֵּק גשר שאני מכיר"> <!ENTITY torsettings.useBridges.label "הכנס מידע גשר ממקור מהימן."> <!ENTITY torsettings.useBridges.placeholder "הכנס כתובת:פתחה (אחד לשורה)">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 19 Mar '18

19 Mar '18

commit 93e22f0ef589b1620931567da6ed70b61b74d630 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 19 18:16:34 2018 +0000 Update translations for tor-launcher-network-settings --- he/network-settings.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/he/network-settings.dtd b/he/network-settings.dtd index 02f7139b8..f11c418f9 100644 --- a/he/network-settings.dtd +++ b/he/network-settings.dtd @@ -41,9 +41,9 @@ <!ENTITY torsettings.useBridges.checkbox "Tor מצונזר במדינה שלי"> <!ENTITY torsettings.useBridges.default "בחר גשר מובנה"> <!ENTITY torsettings.useBridges.default.placeholder "בחר גשר"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.bridgeDB "בקש גשר מן torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "הכנס את התווים מהתמונה"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "קבל אתגר חדש"> <!ENTITY torsettings.useBridges.captchaSubmit "הגש"> <!ENTITY torsettings.useBridges.custom "סַפֵּק גשר שאני מכיר"> <!ENTITY torsettings.useBridges.label "הכנס מידע גשר ממקור מהימן.">

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 19 Mar '18

19 Mar '18

commit a13673da044b80fc75e1baf722f6c6927dc395a8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 19 18:16:22 2018 +0000 Update translations for tor-launcher-properties_completed --- he/torlauncher.properties | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/he/torlauncher.properties b/he/torlauncher.properties index 0ca3eddb2..e9b34888c 100644 --- a/he/torlauncher.properties +++ b/he/torlauncher.properties @@ -26,11 +26,21 @@ torlauncher.error_proxy_addr_missing=אתה חייב לציין כתובת IP א torlauncher.error_proxy_type_missing=אתה חייב לבחור את סוג ייפוי-הכוח. torlauncher.error_bridges_missing=אתה חייב לציין גשר אחד או יותר. torlauncher.error_default_bridges_type_missing=אתה חייב לבחור סוג תעבורה עבור הגשרים המסופקים. +torlauncher.error_bridgedb_bridges_missing=אנא בקש גשר. torlauncher.error_bridge_bad_default_type=אין גשרים מסופקים זמינים שיש להם את סוג התעבורה %S. אנא התאם את הגדרותיך. torlauncher.bridge_suffix.meek-amazon=(עובד בסין) torlauncher.bridge_suffix.meek-azure=(עובד בסין) +torlauncher.request_a_bridge=בקש גשר... +torlauncher.request_a_new_bridge=בקש גשר חדש... +torlauncher.contacting_bridgedb=יוצר קשר עם BridgeDB. אנא המתן. +torlauncher.captcha_prompt=פתור את ה־CAPTCHA כדי לבקש גשר. +torlauncher.bad_captcha_solution=הפתרון אינו נכון. אנא נסה שוב. +torlauncher.unable_to_get_bridge=לא היה ניתן להשיג גשר מן BridgeDB.\n\n%S +torlauncher.no_meek=דפדפן זה אינו מוגדר עבור meek, אשר דרוש כדי להשיג גשרים. +torlauncher.no_bridges_available=אין גשרים זמינים הפעם. סליחה. + torlauncher.connect=התחבר torlauncher.restart_tor=הפעל מחדש את Tor torlauncher.quit=צא @@ -62,3 +72,7 @@ torlauncher.bootstrapWarning.timeout=החיבור פקע torlauncher.bootstrapWarning.noroute=אין נתיב למארח torlauncher.bootstrapWarning.ioerror=שגיאה של קריאה/כתיבה torlauncher.bootstrapWarning.pt_missing=תעבורה נתיקה חסרה + +torlauncher.nsresult.NS_ERROR_NET_RESET=החיבור אל השרת אבד. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=לא היה ניתן להתחבר אל השרת. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=לא היה ניתן להתחבר אל ייפוי הכוח.

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 19 Mar '18

19 Mar '18

commit 6d06752856d83fd60b112096992a348fcd6811ad Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 19 18:16:15 2018 +0000 Update translations for tor-launcher-properties --- he/torlauncher.properties | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/he/torlauncher.properties b/he/torlauncher.properties index cf04e2c4d..e9b34888c 100644 --- a/he/torlauncher.properties +++ b/he/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=אתה חייב לציין כתובת IP א torlauncher.error_proxy_type_missing=אתה חייב לבחור את סוג ייפוי-הכוח. torlauncher.error_bridges_missing=אתה חייב לציין גשר אחד או יותר. torlauncher.error_default_bridges_type_missing=אתה חייב לבחור סוג תעבורה עבור הגשרים המסופקים. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=אנא בקש גשר. torlauncher.error_bridge_bad_default_type=אין גשרים מסופקים זמינים שיש להם את סוג התעבורה %S. אנא התאם את הגדרותיך. torlauncher.bridge_suffix.meek-amazon=(עובד בסין) torlauncher.bridge_suffix.meek-azure=(עובד בסין) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=בקש גשר... +torlauncher.request_a_new_bridge=בקש גשר חדש... +torlauncher.contacting_bridgedb=יוצר קשר עם BridgeDB. אנא המתן. +torlauncher.captcha_prompt=פתור את ה־CAPTCHA כדי לבקש גשר. +torlauncher.bad_captcha_solution=הפתרון אינו נכון. אנא נסה שוב. +torlauncher.unable_to_get_bridge=לא היה ניתן להשיג גשר מן BridgeDB.\n\n%S +torlauncher.no_meek=דפדפן זה אינו מוגדר עבור meek, אשר דרוש כדי להשיג גשרים. +torlauncher.no_bridges_available=אין גשרים זמינים הפעם. סליחה. torlauncher.connect=התחבר torlauncher.restart_tor=הפעל מחדש את Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=אין נתיב למארח torlauncher.bootstrapWarning.ioerror=שגיאה של קריאה/כתיבה torlauncher.bootstrapWarning.pt_missing=תעבורה נתיקה חסרה -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=החיבור אל השרת אבד. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=לא היה ניתן להתחבר אל השרת. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=לא היה ניתן להתחבר אל ייפוי הכוח.

1 0

[tor/master] Use tor_asprintf for in have_enough_mem_for_dircache()
by nickm＠torproject.org 19 Mar '18

19 Mar '18

commit bc5f79b95c5f809635bc84dbdd3010350bfbc269 Author: Neel Chauhan <neel(a)neelc.org> Date: Mon Mar 19 12:27:07 2018 -0400 Use tor_asprintf for in have_enough_mem_for_dircache() (Fixes bug 20887) --- changes/bug20887 | 4 ++++ src/or/config.c | 15 +++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/changes/bug20887 b/changes/bug20887 new file mode 100644 index 000000000..5d4e4ed23 --- /dev/null +++ b/changes/bug20887 @@ -0,0 +1,4 @@ + o Minor bugfixes (freebsd): + - In have_enough_mem_for_dircache(), the variable DIRCACHE_MIN_MEM_MB + does not stringify on FreeBSD, so we switch to tor_asprintf(). Fixes + bug 20887; bugfix on 0.2.8.1-alpha. Patch by Neel Chauhan. diff --git a/src/or/config.c b/src/or/config.c index 0b161554c..212c6c6b9 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4625,15 +4625,14 @@ have_enough_mem_for_dircache(const or_options_t *options, size_t total_mem, if (options->DirCache) { if (total_mem < DIRCACHE_MIN_MEM_BYTES) { if (options->BridgeRelay) { - *msg = tor_strdup("Running a Bridge with less than " - STRINGIFY(DIRCACHE_MIN_MEM_MB) " MB of memory is not " - "recommended."); + tor_asprintf(msg, "Running a Bridge with less than %d MB of memory " + "is not recommended.", DIRCACHE_MIN_MEM_MB); } else { - *msg = tor_strdup("Being a directory cache (default) with less than " - STRINGIFY(DIRCACHE_MIN_MEM_MB) " MB of memory is not " - "recommended and may consume most of the available " - "resources, consider disabling this functionality by " - "setting the DirCache option to 0."); + tor_asprintf(msg, "Being a directory cache (default) with less than " + "%d MB of memory is not recommended and may consume " + "most of the available resources. Consider disabling " + "this functionality by setting the DirCache option " + "to 0.", DIRCACHE_MIN_MEM_MB); } } } else {

1 0

[collector/master] Bump version to 1.5.1-dev.
by karsten＠torproject.org 19 Mar '18

19 Mar '18

commit 88867bf3b4e880478f8392d7f593dbd5ec6c38a2 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Mar 19 16:26:13 2018 +0100 Bump version to 1.5.1-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index d7372bc..780f24e 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.5.1" /> + <property name="release.version" value="1.5.1-dev" /> <property name="project-main-class" value="org.torproject.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.2.0" />

1 0