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

[tor/master] Merge remote-tracking branch 'arma/ticket23637'
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 649000662d3b5f7000c9a4b06444f154e3b0628d Merge: 350fecfaf 8dff23eb3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 12:52:41 2017 -0400 Merge remote-tracking branch 'arma/ticket23637' changes/ticket23637 | 5 +++++ src/or/policies.c | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-)

1 0

[tor/master] Assign Exit flag only for ports 80 and 443
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 8dff23eb34cf63278f8c78eb965c77fe215b860c Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Sep 24 19:27:07 2017 -0400 Assign Exit flag only for ports 80 and 443 Make the "Exit" flag assignment only depend on whether the exit policy allows connections to ports 80 and 443. Previously relays would get the Exit flag if they allowed connections to one of these ports and also port 6667. Resolves ticket 23637. --- changes/ticket23637 | 5 +++++ src/or/policies.c | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/changes/ticket23637 b/changes/ticket23637 new file mode 100644 index 000000000..8687ab1a0 --- /dev/null +++ b/changes/ticket23637 @@ -0,0 +1,5 @@ + o Minor features: + - Make the "Exit" flag assignment only depend on whether the exit + policy allows connections to ports 80 and 443. Previously relays + would get the Exit flag if they allowed connections to one of + these ports and also port 6667. Resolves ticket 23637. diff --git a/src/or/policies.c b/src/or/policies.c index 4c24bfbc3..78451db8f 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -2186,21 +2186,16 @@ exit_policy_is_general_exit_helper(smartlist_t *policy, int port) } /** Return true iff <b>ri</b> is "useful as an exit node", meaning - * it allows exit to at least one /8 address space for at least - * two of ports 80, 443, and 6667. */ + * it allows exit to at least one /8 address space for each of ports 80 + * and 443. */ int exit_policy_is_general_exit(smartlist_t *policy) { - static const int ports[] = { 80, 443, 6667 }; - int n_allowed = 0; - int i; if (!policy) /*XXXX disallow NULL policies? */ return 0; - for (i = 0; i < 3; ++i) { - n_allowed += exit_policy_is_general_exit_helper(policy, ports[i]); - } - return n_allowed >= 2; + return (exit_policy_is_general_exit_helper(policy, 80) && + exit_policy_is_general_exit_helper(policy, 443)); } /** Return false if <b>policy</b> might permit access to some addr:port;

1 0

[tor/master] Repair "make check"
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit f709dce414b8a8ebe95026a9e3fa763acdb17aff Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 12:54:21 2017 -0400 Repair "make check" --- changes/ticket23637 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/ticket23637 b/changes/ticket23637 index 8687ab1a0..0c524f34c 100644 --- a/changes/ticket23637 +++ b/changes/ticket23637 @@ -1,4 +1,4 @@ - o Minor features: + o Minor features (directory authority): - Make the "Exit" flag assignment only depend on whether the exit policy allows connections to ports 80 and 443. Previously relays would get the Exit flag if they allowed connections to one of

1 0

[torspec/master] Merge remote-tracking branch 'arma/ticket23637-spec'
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 42065cfb2925f3f0eb4a5b190feef2210228b44b Merge: c912116 4bc533e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 12:53:16 2017 -0400 Merge remote-tracking branch 'arma/ticket23637-spec' dir-spec.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[torspec/master] assign Exit flag differently (from ticket 23637)
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 4bc533ed4c49d7bedaec7ef272d8cb481eb5bc92 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Sep 24 19:36:16 2017 -0400 assign Exit flag differently (from ticket 23637) --- dir-spec.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index bb34292..4a2573e 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2351,8 +2351,9 @@ [XXXX what happens when we have less than 4 days of MTBF info.] "Exit" -- A router is called an 'Exit' iff it allows exits to at - least two of the ports 80, 443, and 6667 and allows exits to at - least one /8 address space. + least one /8 address space on each of ports 80 and 443. (Up until + Tor version 0.3.2, the flag was assigned if relays exit to at least + two of the ports 80, 443, and 6667.) "Fast" -- A router is 'Fast' if it is active, and its bandwidth is either in the top 7/8ths for known active routers or at least 100KB/s.

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 24 Oct '17

24 Oct '17

commit 4b7ef9b79057057639759da3a0eef61168507f89 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 24 15:45:53 2017 +0000 Update translations for https_everywhere_completed --- th/https-everywhere.dtd | 61 +++++++++++++++++++------------------------------ 1 file changed, 23 insertions(+), 38 deletions(-) diff --git a/th/https-everywhere.dtd b/th/https-everywhere.dtd index 93d99c7c2..15eef8316 100644 --- a/th/https-everywhere.dtd +++ b/th/https-everywhere.dtd @@ -2,49 +2,34 @@ <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_description "เข้ารหัสเว็บ! ใช้ความปลอดภัย HTTPS โดยอัตโนมัติกับหลายเว็บไซต์"> <!ENTITY https-everywhere.about.version "รุ่น"> -<!ENTITY https-everywhere.about.created_by "สร้างโดย"> -<!ENTITY https-everywhere.about.librarians "คลังกฎ"> -<!ENTITY https-everywhere.about.thanks "ขอบคุณ"> -<!ENTITY https-everywhere.about.contribute "ถ้าคุณชอบ HTTPS Everywhere คุณอาจลองพิจารณา"> -<!ENTITY https-everywhere.about.donate_tor "บริจาคให้กับ Tor"> -<!ENTITY https-everywhere.about.tor_lang_code "en"> -<!ENTITY https-everywhere.about.or "หรือ"> -<!ENTITY https-everywhere.about.donate_eff "บริจาคให้กับ EFF"> +<!ENTITY https-everywhere.about.add_new_rule "เพิ่มกฎใหม่"> -<!ENTITY https-everywhere.menu.about "เกี่ยวกับ HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.donate_eff_imperative "บริจาคให้ EFF"> <!ENTITY https-everywhere.menu.observatory "ปรับแต่งหอสำรวจ SSL"> <!ENTITY https-everywhere.menu.globalEnable "เปิดใช้ HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.globalDisable "ปิดใช้ HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.blockHttpRequests "หยุดการเชื่อมต่อผ่าน HTTP"> +<!ENTITY https-everywhere.menu.blockUnencryptedRequests "บล็อคทุกคำขอที่ไม่ได้เข้ารหัส"> <!ENTITY https-everywhere.menu.showCounter "แสดงตัวนับผู้ดู"> <!ENTITY https-everywhere.menu.viewAllRules "ดูกติกาทั้งหมด"> -<!ENTITY https-everywhere.prefs.title "ปรับแต่ง HTTPS Everywhere"> -<!ENTITY https-everywhere.prefs.enable_all "เปิดใช้ทั้งหมด"> -<!ENTITY https-everywhere.prefs.disable_all "ปิดใช้ทั้งหมด"> -<!ENTITY https-everywhere.prefs.reset_defaults "ล้างเป็นค่าตั้งต้น"> -<!ENTITY https-everywhere.prefs.search "ค้นหา"> -<!ENTITY https-everywhere.prefs.site "ไซต์"> -<!ENTITY https-everywhere.prefs.notes "โน้ต"> -<!ENTITY https-everywhere.prefs.list_caption "กฎ HTTPS redirection อันไหนที่ควรใช้?"> -<!ENTITY https-everywhere.prefs.enabled "เปิดใช้"> -<!ENTITY https-everywhere.prefs.ruleset_howto "คุณสามารถเรียนรู้วิธีการเขียนกฎเอง (เพื่อให้รองรับเว็บไซต์อื่นๆ เพิ่มขึ้น)"> -<!ENTITY https-everywhere.prefs.here_link "ที่นี่"> -<!ENTITY https-everywhere.prefs.toggle "สลับ"> -<!ENTITY https-everywhere.prefs.reset_default "คืนค่าเริ่มต้น"> -<!ENTITY https-everywhere.prefs.view_xml_source "ดูซอร์ส XML"> - -<!ENTITY https-everywhere.source.downloading "กำลังดาวน์โหลด"> -<!ENTITY https-everywhere.source.filename "ชื่อไฟล์"> -<!ENTITY https-everywhere.source.unable_to_download "ไม่สามารถดาวน์โหลดได้"> +<!ENTITY https-everywhere.options.generalSettings "ตั้งค่าทั่วไป"> +<!ENTITY https-everywhere.options.importSettings "นำเข้าการตั้งค่า"> +<!ENTITY https-everywhere.options.import "นำเข้า"> +<!ENTITY https-everywhere.options.imported "การตั้งค่าของคุณถูกนำเข้าแล้ว"> -<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification"> -<!ENTITY https-everywhere.popup.paragraph1 "เอ๊ะ! คุณเคยใช้รุ่นเสถียรของ HTTPS Everywhere แต่เราอาจจะเผลอปรับรุ่นไปยังรุ่นพัฒนาในการปรับรุ่นครั้งล่าสุด"> -<!ENTITY https-everywhere.popup.paragraph2 "คุณต้องการกลับไปยังรุ่นเสถียรหรือไม่?"> -<!ENTITY https-everywhere.popup.paragraph3 "เรายินดีหากคุณยังคงใช้รุ่นพัฒนา และช่วยเราทำให้ HTTPS Everywhere ดีขั้น คุณอาจพบบั้ก ซึ่งคุณสามารถรายงานไปที่ https-everywhere(a)eff.org ขออภัยในความไม่สะดวกและขอบคุณที่ใช้ HTTPS Everywhere"> -<!ENTITY https-everywhere.popup.keep "นำชั้นเข้าสู่เวอร์ชั่นนักพัฒนา"> -<!ENTITY https-everywhere.popup.revert "ดาวน์โหลดเวอร์ชั่นเสถียรรุ่นล่าสุด"> +<!ENTITY https-everywhere.prefs.export_settings "ส่งออกการตั้งค่า"> +<!ENTITY https-everywhere.prefs.reset_defaults "ล้างเป็นค่าตั้งต้น"> -<!ENTITY https-everywhere.ruleset-tests.status_title "การทดสอบกฎ HTTPS"> -<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "ยกเลิก"> -<!ENTITY https-everywhere.ruleset-tests.status_start_button "เริ่ม"> +<!ENTITY https-everywhere.chrome.stable_rules "กฎเสถียร"> +<!ENTITY https-everywhere.chrome.stable_rules_description "บังคับใช้การเชื่อมต่อที่เข้ารหัสลับกับเว็บไซต์เหล่านี้:"> +<!ENTITY https-everywhere.chrome.experimental_rules "กฎทดลอง"> +<!ENTITY https-everywhere.chrome.experimental_rules_description "อาจทำให้ขึ้นแจ้งเตือนหรือใช้การไม่ได้ ถูกปิดไว้โดยปริยาย"> +<!ENTITY https-everywhere.chrome.add_rule "เพิ่มกฎสำหรับเว็บไซต์นี้"> +<!ENTITY https-everywhere.chrome.add_new_rule "เพิ่มกฎใหม่สำหรับเว็บไซต์นี้"> +<!ENTITY https-everywhere.chrome.always_https_for_host "ใช้ https เสมอกับโฮสต์นี้"> +<!ENTITY https-everywhere.chrome.host "โฮสต์:"> +<!ENTITY https-everywhere.chrome.show_advanced "แสดงตัวเลือกขั้นสูง"> +<!ENTITY https-everywhere.chrome.hide_advanced "ซ่อนตัวเลือกขั้นสูง"> +<!ENTITY https-everywhere.chrome.rule_name "ชื่อกฎ"> +<!ENTITY https-everywhere.chrome.regex "regex เทียบตรงกัน"> +<!ENTITY https-everywhere.chrome.redirect_to "เปลี่ยนทางไป"> +<!ENTITY https-everywhere.chrome.status_cancel_button "ยกเลิก">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 24 Oct '17

24 Oct '17

commit 71e15cdd7b6bbb2370035dce9b33551f55fcde9e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 24 15:45:41 2017 +0000 Update translations for https_everywhere --- th/https-everywhere.dtd | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/th/https-everywhere.dtd b/th/https-everywhere.dtd index 4437908a0..15eef8316 100644 --- a/th/https-everywhere.dtd +++ b/th/https-everywhere.dtd @@ -20,16 +20,16 @@ <!ENTITY https-everywhere.prefs.reset_defaults "ล้างเป็นค่าตั้งต้น"> <!ENTITY https-everywhere.chrome.stable_rules "กฎเสถียร"> -<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> -<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules"> -<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default."> -<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site"> -<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site"> -<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host"> -<!ENTITY https-everywhere.chrome.host "Host:"> -<!ENTITY https-everywhere.chrome.show_advanced "แสดงแบบขั้นสูง"> -<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced"> +<!ENTITY https-everywhere.chrome.stable_rules_description "บังคับใช้การเชื่อมต่อที่เข้ารหัสลับกับเว็บไซต์เหล่านี้:"> +<!ENTITY https-everywhere.chrome.experimental_rules "กฎทดลอง"> +<!ENTITY https-everywhere.chrome.experimental_rules_description "อาจทำให้ขึ้นแจ้งเตือนหรือใช้การไม่ได้ ถูกปิดไว้โดยปริยาย"> +<!ENTITY https-everywhere.chrome.add_rule "เพิ่มกฎสำหรับเว็บไซต์นี้"> +<!ENTITY https-everywhere.chrome.add_new_rule "เพิ่มกฎใหม่สำหรับเว็บไซต์นี้"> +<!ENTITY https-everywhere.chrome.always_https_for_host "ใช้ https เสมอกับโฮสต์นี้"> +<!ENTITY https-everywhere.chrome.host "โฮสต์:"> +<!ENTITY https-everywhere.chrome.show_advanced "แสดงตัวเลือกขั้นสูง"> +<!ENTITY https-everywhere.chrome.hide_advanced "ซ่อนตัวเลือกขั้นสูง"> <!ENTITY https-everywhere.chrome.rule_name "ชื่อกฎ"> -<!ENTITY https-everywhere.chrome.regex "Matching regex"> +<!ENTITY https-everywhere.chrome.regex "regex เทียบตรงกัน"> <!ENTITY https-everywhere.chrome.redirect_to "เปลี่ยนทางไป"> <!ENTITY https-everywhere.chrome.status_cancel_button "ยกเลิก">

1 0

[metrics-web/master] Add missing servlet and JSP for new Services page.
by karsten＠torproject.org 24 Oct '17

24 Oct '17

commit bc255c85113f1559e27d636c120a8f603988a8d9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Oct 24 16:51:57 2017 +0200 Add missing servlet and JSP for new Services page. --- .../torproject/metrics/web/ServicesServlet.java | 30 +++++++++++++ .../src/main/resources/web/WEB-INF/services.jsp | 51 ++++++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/website/src/main/java/org/torproject/metrics/web/ServicesServlet.java b/website/src/main/java/org/torproject/metrics/web/ServicesServlet.java new file mode 100644 index 0000000..c96f22c --- /dev/null +++ b/website/src/main/java/org/torproject/metrics/web/ServicesServlet.java @@ -0,0 +1,30 @@ +/* Copyright 2017 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.metrics.web; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class ServicesServlet extends AnyServlet { + + private static final long serialVersionUID = 516625494518844400L; + + @Override + public void init() throws ServletException { + super.init(); + } + + @Override + public void doGet(HttpServletRequest request, + HttpServletResponse response) throws IOException, ServletException { + + request.setAttribute("categories", this.categories); + request.getRequestDispatcher("WEB-INF/services.jsp").forward(request, + response); + } +} + diff --git a/website/src/main/resources/web/WEB-INF/services.jsp b/website/src/main/resources/web/WEB-INF/services.jsp new file mode 100644 index 0000000..5eac330 --- /dev/null +++ b/website/src/main/resources/web/WEB-INF/services.jsp @@ -0,0 +1,51 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<jsp:include page="top.jsp"> + <jsp:param name="pageTitle" value="Services – Tor Metrics"/> + <jsp:param name="navActive" value="Services"/> +</jsp:include> + + <div class="container"> + <ul class="breadcrumb"> + <li><a href="/">Home</a></li> + <li class="active">Services</li> + </ul> + </div> + + <div class="container"> + <h1>Services <a href="#services" name="services" class="anchor">#</a></h1> + <p>You're running a Tor relay or bridge, or you're affected in some way by somebody else running one? With the following services you can learn everything about currently running Tor nodes or even about nodes that have been running in the past.</p> + </div> + + <div class="container"> + <h2>Network archive <a href="#archive" name="archive" class="anchor">#</a></h2> + <p>The following tool lets you browse the network archive for relays running in the past.</p> + <ul> + <li><a href="https://exonerator.torproject.org/" target="_blank">ExoneraTor</a> tells you if an IP was used by a Tor relay on a given date.</li> + </ul> + </div> + + <div class="container"> + <h2>Network status <a href="#status" name="status" class="anchor">#</a></h2> + <p>The following tools let you explore currently running relays and bridges.</p> + <ul> + <li><a href="https://atlas.torproject.org/" target="_blank">Atlas</a> displays data about single relays and bridges in the Tor network.</li> + <li><a href="https://compass.torproject.org/" target="_blank">Compass</a> groups current relays in different ways to measure Tor's network diversity.</li> + <li><a href="https://consensus-health.torproject.org/" target="_blank">Consensus Health</a> displays information about the current directory consensus and votes.</li> + <li><a href="https://duckduckgo.com/" target="_blank">DuckDuckGo</a> displays Tor node details when including the keywords "tor node" in a search.</li> + <li><a href="https://onionview.codeplex.com/" target="_blank">OnionView</a> plots the location of active Tor nodes on an interactive map of the world.</li> + <li><a href="https://onionite.now.sh/" target="_blank">Onionite</a> is a Progressive Web App to view information on the individual nodes that make up the Tor network.</li> + </ul> + </div> + + <div class="container"> + <h2>Network health notifications <a href="#health" name="health" class="anchor">#</a></h2> + <p>The following tools inform you of any problems with relays and bridges.</p> + <ul> + <li><a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-consensus-health" target="_blank">Consensus Issues</a> emails directory authority operators about consensus problems.</li> + <li><a href="http://lists.infolabe.net/lists/listinfo/infolabe-anomalies" target="_blank">OII's anomaly detection system</a> ranks countries by how anomalous their Tor usage is.</li> + </ul> + </div> + +<jsp:include page="bottom.jsp"/> +

1 0

[metrics-web/master] Rename Operation section to Services.
by karsten＠torproject.org 24 Oct '17

24 Oct '17

commit a52850fc04bc3cd1de194691dd9280f78df4bf67 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Oct 24 16:47:32 2017 +0200 Rename Operation section to Services. Implements #23716. --- website/src/main/resources/etc/web.xml | 11 +++++ .../src/main/resources/web/WEB-INF/operation.jsp | 51 +++++----------------- website/src/main/resources/web/WEB-INF/top.jsp | 2 +- 3 files changed, 22 insertions(+), 42 deletions(-) diff --git a/website/src/main/resources/etc/web.xml b/website/src/main/resources/etc/web.xml index 830e8e7..fe7d286 100644 --- a/website/src/main/resources/etc/web.xml +++ b/website/src/main/resources/etc/web.xml @@ -262,6 +262,17 @@ </servlet-mapping> <servlet> + <servlet-name>ServicesServlet</servlet-name> + <servlet-class> + org.torproject.metrics.web.ServicesServlet + </servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>ServicesServlet</servlet-name> + <url-pattern>/services.html</url-pattern> + </servlet-mapping> + + <servlet> <servlet-name>DevelopmentServlet</servlet-name> <servlet-class> org.torproject.metrics.web.DevelopmentServlet diff --git a/website/src/main/resources/web/WEB-INF/operation.jsp b/website/src/main/resources/web/WEB-INF/operation.jsp index 3c83925..b86c891 100644 --- a/website/src/main/resources/web/WEB-INF/operation.jsp +++ b/website/src/main/resources/web/WEB-INF/operation.jsp @@ -5,47 +5,16 @@ <jsp:param name="navActive" value="Operation"/> </jsp:include> - <div class="container"> - <ul class="breadcrumb"> - <li><a href="/">Home</a></li> - <li class="active">Operation</li> - </ul> - </div> - - <div class="container"> - <h1>Operation <a href="#operation" name="operation" class="anchor">#</a></h1> - <p>You're operating a Tor relay or bridge, or you're affected in some way by somebody else operating one? Here you can learn everything about currently running Tor nodes or even about nodes that have been running in the past.</p> - </div> - - <div class="container"> - <h2>Network archive <a href="#archive" name="archive" class="anchor">#</a></h2> - <p>The following tool lets you browse the network archive for relays running in the past.</p> - <ul> - <li><a href="https://exonerator.torproject.org/" target="_blank">ExoneraTor</a> tells you if an IP was used by a Tor relay on a given date.</li> - </ul> - </div> - - <div class="container"> - <h2>Network status <a href="#status" name="status" class="anchor">#</a></h2> - <p>The following tools let you explore currently running relays and bridges.</p> - <ul> - <li><a href="https://atlas.torproject.org/" target="_blank">Atlas</a> displays data about single relays and bridges in the Tor network.</li> - <li><a href="https://compass.torproject.org/" target="_blank">Compass</a> groups current relays in different ways to measure Tor's network diversity.</li> - <li><a href="https://consensus-health.torproject.org/" target="_blank">Consensus Health</a> displays information about the current directory consensus and votes.</li> - <li><a href="https://duckduckgo.com/" target="_blank">DuckDuckGo</a> displays Tor node details when including the keywords "tor node" in a search.</li> - <li><a href="https://onionview.codeplex.com/" target="_blank">OnionView</a> plots the location of active Tor nodes on an interactive map of the world.</li> - <li><a href="https://onionite.now.sh/" target="_blank">Onionite</a> is a Progressive Web App to view information on the individual nodes that make up the Tor network.</li> - </ul> - </div> - - <div class="container"> - <h2>Network health notifications <a href="#health" name="health" class="anchor">#</a></h2> - <p>The following tools inform you of any problems with relays and bridges.</p> - <ul> - <li><a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-consensus-health" target="_blank">Consensus Issues</a> emails directory authority operators about consensus problems.</li> - <li><a href="http://lists.infolabe.net/lists/listinfo/infolabe-anomalies" target="_blank">OII's anomaly detection system</a> ranks countries by how anomalous their Tor usage is.</li> - </ul> - </div> + <div class="jumbotron"> + <div class="text-center"> + <h2> + Operation + </h2> + <p>This page has moved to <code><a href="https://metrics.torproject.org/services.html">https://metrics.torproject.org/services.html</a></code>.</p> + <p>Please update any bookmarks and report any links to this page.</p> + <p>This placeholder page will be removed in the future.</p> + </div> + </div> <jsp:include page="bottom.jsp"/> diff --git a/website/src/main/resources/web/WEB-INF/top.jsp b/website/src/main/resources/web/WEB-INF/top.jsp index e5e95eb..f7a702f 100644 --- a/website/src/main/resources/web/WEB-INF/top.jsp +++ b/website/src/main/resources/web/WEB-INF/top.jsp @@ -88,7 +88,7 @@ document.write('<div class="topButton" style="display:none;"><a href="#top"><i c <li class="visible-xs section-header">More</li> <li <c:if test="${'News'.equals(param.navActive)}"> class="active"</c:if>><a href="/news.html"><i class="fa fa-newspaper-o fa-fw hidden-sm" aria-hidden="true"></i> News</a></li> <li <c:if test="${'Sources'.equals(param.navActive)}"> class="active"</c:if>><a href="/sources.html"><i class="fa fa-archive fa-fw hidden-sm" aria-hidden="true"></i> Sources</a></li> - <li <c:if test="${'Operation'.equals(param.navActive)}"> class="active"</c:if>><a href="/operation.html"><i class="fa fa-cogs fa-fw hidden-sm" aria-hidden="true"></i> Operation</a></li> + <li <c:if test="${'Services'.equals(param.navActive)}"> class="active"</c:if>><a href="/services.html"><i class="fa fa-cogs fa-fw hidden-sm" aria-hidden="true"></i> Services</a></li> <li <c:if test="${'Development'.equals(param.navActive)}"> class="active"</c:if>><a href="/development.html"><i class="fa fa-code fa-fw hidden-sm" aria-hidden="true"></i> Development</a></li> <li <c:if test="${'Research'.equals(param.navActive)}"> class="active"</c:if>><a href="/research.html"><i class="fa fa-university fa-fw hidden-sm" aria-hidden="true"></i> Research</a></li> <li <c:if test="${'About'.equals(param.navActive)}"> class="active"</c:if>><a href="/about.html"><i class="fa fa-lightbulb-o fa-fw hidden-sm" aria-hidden="true"></i> About</a></li>

1 0

[tor/release-0.3.1] bump version in the other places :/
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 5325e7ccab70383a629019323ba01d2c9215b5f4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:11:17 2017 -0400 bump version in the other places :/ --- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 48a4d8e75..a179d8483 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.0.11-dev" +!define VERSION "0.3.0.12" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 7399f8178..47a00dc6d 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.0.11-dev" +#define VERSION "0.3.0.12"

1 0