September 2017 - tor-commits - lists.torproject.org

[torspec/master] Document new GETINFO ip-to-country/ipv[46]-available options
by nickm＠torproject.org 08 Sep '17

08 Sep '17

commit dc973f84d742af55eceae1951260988f88599374 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 25 12:26:42 2017 -0400 Document new GETINFO ip-to-country/ipv[46]-available options Documents ticket 23237. --- control-spec.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/control-spec.txt b/control-spec.txt index 69a77c1..e89a25d 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -744,6 +744,11 @@ A space-separated list of all the values supported by the SIGNAL command. + "ip-to-country/ipv4-available" + "ip-to-country/ipv6-available" + "1" if the relevant geoip or geoip6 database is present; "0" otherwise. + This field was added in Tor 0.3.2.1-alpha. + "ip-to-country/*" Maps IP addresses to 2-letter country codes. For example, "GETINFO ip-to-country/18.0.0.1" should give "US".

1 0

[tor/master] Merge branch 'feature23237'
by nickm＠torproject.org 08 Sep '17

08 Sep '17

commit 1b1eeb0fb916c424ac8836ca2ec357d25967e041 Merge: 22e688029 96aed28f1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 8 08:10:15 2017 -0400 Merge branch 'feature23237' changes/feature23237 | 4 ++++ src/or/geoip.c | 9 +++++++++ 2 files changed, 13 insertions(+)

1 0

[tor/master] New GETINFO target to check if geoip is loaded
by nickm＠torproject.org 08 Sep '17

08 Sep '17

commit 96aed28f143298b33363a7a0ca997e2a4d2eae29 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 25 12:25:05 2017 -0400 New GETINFO target to check if geoip is loaded Closes ticket 23237. --- changes/feature23237 | 4 ++++ src/or/geoip.c | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/changes/feature23237 b/changes/feature23237 new file mode 100644 index 000000000..261577261 --- /dev/null +++ b/changes/feature23237 @@ -0,0 +1,4 @@ + o Minor features (controller): + - Added new GETINFO targets ip-to-country/{ipv4,ipv6}-available, so + controllers can tell whether the geoip databases are loaded. + Closes ticket 23237. diff --git a/src/or/geoip.c b/src/or/geoip.c index 65d00b865..3944b2cf6 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -1665,6 +1665,15 @@ getinfo_helper_geoip(control_connection_t *control_conn, sa_family_t family; tor_addr_t addr; question += strlen("ip-to-country/"); + + if (!strcmp(question, "ipv4-available") || + !strcmp(question, "ipv6-available")) { + family = !strcmp(question, "ipv4-available") ? AF_INET : AF_INET6; + const int available = geoip_is_loaded(family); + tor_asprintf(answer, "%d", !! available); + return 0; + } + family = tor_addr_parse(&addr, question); if (family != AF_INET && family != AF_INET6) { *errmsg = "Invalid address family";

1 0

[tor/master] Merge branch 'ticket22377'
by nickm＠torproject.org 08 Sep '17

08 Sep '17

commit 22e6880296185f2ed12755290f73dc30b3dc5510 Merge: e5e2df36f 408ed52e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 8 08:06:44 2017 -0400 Merge branch 'ticket22377' changes/ticket22377 | 4 ++++ src/or/control.c | 47 ++++------------------------------------------- src/or/control.h | 9 ++------- src/or/dirserv.c | 12 ------------ 4 files changed, 10 insertions(+), 62 deletions(-)

1 0

[tor/master] Remove the AUTHDIR_NEWDESCS feature: nobody is using it any more
by nickm＠torproject.org 08 Sep '17

08 Sep '17

commit 408ed52e3d5b9ec973f12ed21d2a77abc4f15d8f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 24 16:51:46 2017 -0400 Remove the AUTHDIR_NEWDESCS feature: nobody is using it any more If somebody asks for it, log a warning. Closes ticket 22377. --- changes/ticket22377 | 4 ++++ src/or/control.c | 47 ++++------------------------------------------- src/or/control.h | 9 ++------- src/or/dirserv.c | 12 ------------ 4 files changed, 10 insertions(+), 62 deletions(-) diff --git a/changes/ticket22377 b/changes/ticket22377 new file mode 100644 index 000000000..4f15c1620 --- /dev/null +++ b/changes/ticket22377 @@ -0,0 +1,4 @@ + o Removed features: + - The controller API no longer includes an AUTHDIR_NEWDESCS event: + nobody was using it any longer. Closes ticket 22377. + diff --git a/src/or/control.c b/src/or/control.c index bc173a6e1..c9551829f 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1154,7 +1154,6 @@ static const struct control_event_t control_event_table[] = { { EVENT_ERR_MSG, "ERR" }, { EVENT_NEW_DESC, "NEWDESC" }, { EVENT_ADDRMAP, "ADDRMAP" }, - { EVENT_AUTHDIR_NEWDESCS, "AUTHDIR_NEWDESCS" }, { EVENT_DESCCHANGED, "DESCCHANGED" }, { EVENT_NS, "NS" }, { EVENT_STATUS_GENERAL, "STATUS_GENERAL" }, @@ -1194,7 +1193,10 @@ handle_control_setevents(control_connection_t *conn, uint32_t len, SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); SMARTLIST_FOREACH_BEGIN(events, const char *, ev) { - if (!strcasecmp(ev, "EXTENDED")) { + if (!strcasecmp(ev, "EXTENDED") || + !strcasecmp(ev, "AUTHDIR_NEWDESCS")) { + log_warn(LD_CONTROL, "The \"%s\" SETEVENTS argument is no longer " + "supported.", ev); continue; } else { int i; @@ -6053,47 +6055,6 @@ control_event_address_mapped(const char *from, const char *to, time_t expires, return 0; } -/** The authoritative dirserver has received a new descriptor that - * has passed basic syntax checks and is properly self-signed. - * - * Notify any interested party of the new descriptor and what has - * been done with it, and also optionally give an explanation/reason. */ -int -control_event_or_authdir_new_descriptor(const char *action, - const char *desc, size_t desclen, - const char *msg) -{ - char firstline[1024]; - char *buf; - size_t totallen; - char *esc = NULL; - size_t esclen; - - if (!EVENT_IS_INTERESTING(EVENT_AUTHDIR_NEWDESCS)) - return 0; - - tor_snprintf(firstline, sizeof(firstline), - "650+AUTHDIR_NEWDESC=\r\n%s\r\n%s\r\n", - action, - msg ? msg : ""); - - /* Escape the server descriptor properly */ - esclen = write_escaped_data(desc, desclen, &esc); - - totallen = strlen(firstline) + esclen + 1; - buf = tor_malloc(totallen); - strlcpy(buf, firstline, totallen); - strlcpy(buf+strlen(firstline), esc, totallen); - send_control_event_string(EVENT_AUTHDIR_NEWDESCS, - buf); - send_control_event_string(EVENT_AUTHDIR_NEWDESCS, - "650 OK\r\n"); - tor_free(esc); - tor_free(buf); - - return 0; -} - /** Cached liveness for network liveness events and GETINFO */ diff --git a/src/or/control.h b/src/or/control.h index 41a194bfc..5f6dcc352 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -33,7 +33,6 @@ void connection_control_closed(control_connection_t *conn); int connection_control_process_inbuf(control_connection_t *conn); -#define EVENT_AUTHDIR_NEWDESCS 0x000D #define EVENT_NS 0x000F int control_event_is_interesting(int event); @@ -64,10 +63,6 @@ int control_event_descriptors_changed(smartlist_t *routers); int control_event_address_mapped(const char *from, const char *to, time_t expires, const char *error, const int cached); -int control_event_or_authdir_new_descriptor(const char *action, - const char *desc, - size_t desclen, - const char *msg); int control_event_my_descriptor_changed(void); int control_event_network_liveness_update(int liveness); int control_event_networkstatus_changed(smartlist_t *statuses); @@ -169,8 +164,8 @@ void control_free_all(void); #define EVENT_WARN_MSG 0x000A #define EVENT_ERR_MSG 0x000B #define EVENT_ADDRMAP 0x000C -/* Exposed above */ -// #define EVENT_AUTHDIR_NEWDESCS 0x000D +/* There was an AUTHDIR_NEWDESCS event, but it no longer exists. We + can reclaim 0x000D. */ #define EVENT_DESCCHANGED 0x000E /* Exposed above */ // #define EVENT_NS 0x000F diff --git a/src/or/dirserv.c b/src/or/dirserv.c index e5654e3b9..109857ee1 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -673,9 +673,6 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source) ri->nickname, source, (int)ri->cache_info.signed_descriptor_len, MAX_DESCRIPTOR_UPLOAD_SIZE); *msg = "Router descriptor was too large."; - control_event_or_authdir_new_descriptor("REJECTED", - ri->cache_info.signed_descriptor_body, - desclen, *msg); r = ROUTER_AUTHDIR_REJECTS; goto fail; } @@ -694,9 +691,6 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source) router_describe(ri), source); *msg = "Not replacing router descriptor; no information has changed since " "the last one with this identity."; - control_event_or_authdir_new_descriptor("DROPPED", - ri->cache_info.signed_descriptor_body, - desclen, *msg); r = ROUTER_IS_ALREADY_KNOWN; goto fail; } @@ -709,9 +703,6 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source) if (ed25519_validate_pubkey(pkey) < 0) { log_warn(LD_DIRSERV, "Received bad key from %s (source %s)", router_describe(ri), source); - control_event_or_authdir_new_descriptor("REJECTED", - ri->cache_info.signed_descriptor_body, - desclen, *msg); routerinfo_free(ri); return ROUTER_AUTHDIR_REJECTS; } @@ -749,14 +740,11 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source) r = router_add_to_routerlist(ri, msg, 0, 0); if (!WRA_WAS_ADDED(r)) { /* unless the routerinfo was fine, just out-of-date */ - if (WRA_WAS_REJECTED(r)) - control_event_or_authdir_new_descriptor("REJECTED", desc, desclen, *msg); log_info(LD_DIRSERV, "Did not add descriptor from '%s' (source: %s): %s.", nickname, source, *msg ? *msg : "(no message)"); } else { smartlist_t *changed; - control_event_or_authdir_new_descriptor("ACCEPTED", desc, desclen, *msg); changed = smartlist_new(); smartlist_add(changed, ri);

1 0

[torspec/master] Note that AUTHDIR_NEWDESCS has been removed. #22377
by nickm＠torproject.org 08 Sep '17

08 Sep '17

commit 6e887baac8f5003b414e486659cdd082ffc07093 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 8 08:08:25 2017 -0400 Note that AUTHDIR_NEWDESCS has been removed. #22377 --- control-spec.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/control-spec.txt b/control-spec.txt index 69a77c1..0df4a1a 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -2148,6 +2148,8 @@ 4.1.8. Descriptors uploaded to us in our role as authoritative dirserver + [NOTE: This feature was removed in Tor 0.3.2.1-alpha.] + Tor generates this event when it's an directory authority, and somebody has just uploaded a server descriptor.

1 0

[tor-browser-build/master] Add tmp to .gitignore
by boklm＠torproject.org 08 Sep '17

08 Sep '17

commit 84881888708f4fd163b1867193fed6471d0c53a9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 8 11:13:10 2017 +0200 Add tmp to .gitignore With #23403 we started using the tor-browser-build/tmp directory for the builds. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c4c3919..efd3840 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /testbuild /rbm.local.conf /logs +/tmp

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 08 Sep '17

08 Sep '17

commit 121f53c01504639aa647e8e04f4fd9f561717406 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 8 08:45:53 2017 +0000 Update translations for tails-persistence-setup --- my/my.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/my/my.po b/my/my.po index 1f6897460..f48478cb9 100644 --- a/my/my.po +++ b/my/my.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-05-17 03:09+0000\n" +"PO-Revision-Date: 2017-09-08 08:24+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Burmese (http://www.transifex.com/otf/torproject/language/my/)\n" "MIME-Version: 1.0\n" @@ -312,7 +312,7 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Delete.pm:54 msgid "Delete" -msgstr "" +msgstr "ဖျက်ရန်" #: ../lib/Tails/Persistence/Step/Delete.pm:111 msgid "Deleting..."

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 08 Sep '17

08 Sep '17

commit 9f8978ade3d3f3fa1ad260163aa72c8d9a423a0d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 8 08:45:40 2017 +0000 Update translations for https_everywhere_completed --- tr/https-everywhere.dtd | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tr/https-everywhere.dtd b/tr/https-everywhere.dtd index 50821724d..1b3b34d6d 100644 --- a/tr/https-everywhere.dtd +++ b/tr/https-everywhere.dtd @@ -24,9 +24,22 @@ <!ENTITY https-everywhere.menu.showCounter "Sayacı Görüntüle"> <!ENTITY https-everywhere.menu.viewAllRules "Tüm Kuralları Görüntüle"> +<!ENTITY https-everywhere.options.importSettings "Ayarları İçe Aktar"> +<!ENTITY https-everywhere.options.import "İçe Aktar"> +<!ENTITY https-everywhere.options.imported "Ayarlarınız içe aktarıldı."> + <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Ayarları"> <!ENTITY https-everywhere.prefs.enable_all "Tümünü Etkinleştir"> <!ENTITY https-everywhere.prefs.disable_all "Tümünü Devre Dışı Bırak"> +<!ENTITY https-everywhere.prefs.export_settings "Ayarları Dışa Aktar"> +<!ENTITY https-everywhere.prefs.settings_warning "Uyarı:"> +<!ENTITY https-everywhere.prefs.settings_warning_delete "HTTPS Everywhere ayarlarınızdan bir kısmı silinmek üzere!"> +<!ENTITY https-everywhere.prefs.settings_warning_explain "Bu eklenti yakın gelecekte büyük ölçüde güncellenecektir. Ayarlarınızı dışa aktarmazsanız, aşağıdakilerden bir veya daha fazlasını kaybedebilirsiniz:"> +<!ENTITY https-everywhere.prefs.settings_global "Genel Tercihler"> +<!ENTITY https-everywhere.prefs.settings_toggle "Her site için açma/kapama ayarı"> +<!ENTITY https-everywhere.prefs.settings_custom "Özel site kuralları"> +<!ENTITY https-everywhere.prefs.settings_click_ok "Lütfen 'TAMAM''a tıklayın"> +<!ENTITY https-everywhere.prefs.settings_warning_closing "aşağıda ayarlarınızın kaydedildiğinden emin olmak için. HTTPS Everywhere güncellendiğinde, bu ayarları eklenti seçeneklerinde içe aktarmanız gerekecektir. "> <!ENTITY https-everywhere.prefs.reset_defaults "Varsayılanları Yükle"> <!ENTITY https-everywhere.prefs.search "Ara"> <!ENTITY https-everywhere.prefs.site "Site">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 08 Sep '17

08 Sep '17

commit 7b5b0512d08beaef914576edf3789178a83ee6d4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 8 08:45:32 2017 +0000 Update translations for https_everywhere --- tr/https-everywhere.dtd | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tr/https-everywhere.dtd b/tr/https-everywhere.dtd index d4ff682e6..1b3b34d6d 100644 --- a/tr/https-everywhere.dtd +++ b/tr/https-everywhere.dtd @@ -24,22 +24,22 @@ <!ENTITY https-everywhere.menu.showCounter "Sayacı Görüntüle"> <!ENTITY https-everywhere.menu.viewAllRules "Tüm Kuralları Görüntüle"> -<!ENTITY https-everywhere.options.importSettings "Import Settings"> -<!ENTITY https-everywhere.options.import "Import"> -<!ENTITY https-everywhere.options.imported "Your settings have been imported."> +<!ENTITY https-everywhere.options.importSettings "Ayarları İçe Aktar"> +<!ENTITY https-everywhere.options.import "İçe Aktar"> +<!ENTITY https-everywhere.options.imported "Ayarlarınız içe aktarıldı."> <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Ayarları"> <!ENTITY https-everywhere.prefs.enable_all "Tümünü Etkinleştir"> <!ENTITY https-everywhere.prefs.disable_all "Tümünü Devre Dışı Bırak"> -<!ENTITY https-everywhere.prefs.export_settings "Export Settings"> -<!ENTITY https-everywhere.prefs.settings_warning "Warning:"> -<!ENTITY https-everywhere.prefs.settings_warning_delete "Some of your HTTPS Everywhere settings are about to be deleted!"> -<!ENTITY https-everywhere.prefs.settings_warning_explain "This extension will be upgraded substantially in the near future. If you do not export your settings, you could lose one or more of the following:"> -<!ENTITY https-everywhere.prefs.settings_global "Global preferences"> -<!ENTITY https-everywhere.prefs.settings_toggle "Per-site on/off setting"> -<!ENTITY https-everywhere.prefs.settings_custom "Custom site rules"> -<!ENTITY https-everywhere.prefs.settings_click_ok "Please click 'OK'"> -<!ENTITY https-everywhere.prefs.settings_warning_closing "below to ensure your settings are saved. Once HTTPS Everywhere is upgraded, you will later have to import these settings in the extension options section."> +<!ENTITY https-everywhere.prefs.export_settings "Ayarları Dışa Aktar"> +<!ENTITY https-everywhere.prefs.settings_warning "Uyarı:"> +<!ENTITY https-everywhere.prefs.settings_warning_delete "HTTPS Everywhere ayarlarınızdan bir kısmı silinmek üzere!"> +<!ENTITY https-everywhere.prefs.settings_warning_explain "Bu eklenti yakın gelecekte büyük ölçüde güncellenecektir. Ayarlarınızı dışa aktarmazsanız, aşağıdakilerden bir veya daha fazlasını kaybedebilirsiniz:"> +<!ENTITY https-everywhere.prefs.settings_global "Genel Tercihler"> +<!ENTITY https-everywhere.prefs.settings_toggle "Her site için açma/kapama ayarı"> +<!ENTITY https-everywhere.prefs.settings_custom "Özel site kuralları"> +<!ENTITY https-everywhere.prefs.settings_click_ok "Lütfen 'TAMAM''a tıklayın"> +<!ENTITY https-everywhere.prefs.settings_warning_closing "aşağıda ayarlarınızın kaydedildiğinden emin olmak için. HTTPS Everywhere güncellendiğinde, bu ayarları eklenti seçeneklerinde içe aktarmanız gerekecektir. "> <!ENTITY https-everywhere.prefs.reset_defaults "Varsayılanları Yükle"> <!ENTITY https-everywhere.prefs.search "Ara"> <!ENTITY https-everywhere.prefs.site "Site">

1 0