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

[tor-browser/tor-browser-38.1.0esr-5.0-1] Bug 16316: Fix New Tiles pref bustage.
by mikeperry＠torproject.org 19 Jul '15

19 Jul '15

commit e99a53f4fa96ce4525114403580f3a7194360de5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Jul 13 13:19:47 2015 -0700 Bug 16316: Fix New Tiles pref bustage. This allows us to set the newtiles pref to 'classic' mode for the default value. --- browser/modules/DirectoryLinksProvider.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/modules/DirectoryLinksProvider.jsm b/browser/modules/DirectoryLinksProvider.jsm index 9385c09..3f31b28 100644 --- a/browser/modules/DirectoryLinksProvider.jsm +++ b/browser/modules/DirectoryLinksProvider.jsm @@ -139,7 +139,7 @@ let DirectoryLinksProvider = { * Set appropriate default ping behavior controlled by enhanced pref */ _setDefaultEnhanced: function DirectoryLinksProvider_setDefaultEnhanced() { - if (!Services.prefs.prefHasUserValue(PREF_NEWTAB_ENHANCED)) { + if (Services.prefs.getBoolPref(PREF_NEWTAB_ENHANCED)) { let enhanced = true; try { // Default to not enhanced if DNT is set to tell websites to not track

1 0

[exonerator/master] Add whitespace to HTML output as suggested by Joshua Lee Tucker.
by karsten＠torproject.org 17 Jul '15

17 Jul '15

commit 93db22e4b40038dfa62d264f1590a8a11822b2d5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jul 17 18:01:51 2015 +0200 Add whitespace to HTML output as suggested by Joshua Lee Tucker. --- .../torproject/exonerator/ExoneraTorServlet.java | 217 ++++++++++---------- 1 file changed, 108 insertions(+), 109 deletions(-) diff --git a/src/org/torproject/exonerator/ExoneraTorServlet.java b/src/org/torproject/exonerator/ExoneraTorServlet.java index 47947c7..76da657 100644 --- a/src/org/torproject/exonerator/ExoneraTorServlet.java +++ b/src/org/torproject/exonerator/ExoneraTorServlet.java @@ -512,26 +512,27 @@ public class ExoneraTorServlet extends HttpServlet { private void writeHeader(PrintWriter out) throws IOException { out.println("<!DOCTYPE html>\n" + "<html lang=\"en\">\n" - + "<head>\n" - + "<meta charset=\"utf-8\">\n" - + "<meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\">\n" - + "<meta name=\"viewport\" content=\"width=device-width, " + + " <head>\n" + + " <meta charset=\"utf-8\">\n" + + " <meta http-equiv=\"X-UA-Compatible\" " + + "content=\"IE=edge\">\n" + + " <meta name=\"viewport\" content=\"width=device-width, " + "initial-scale=1\">\n" - + "<title>ExoneraTor</title>\n" - + "<link rel=\"stylesheet\" href=\"css/bootstrap.min.css\">\n" - + "<link rel=\"stylesheet\" href=\"css/exonerator.css\">\n" - + "<link href=\"images/favicon.ico\" type=\"image/x-icon\" " + + " <title>ExoneraTor</title>\n" + + " <link rel=\"stylesheet\" href=\"css/bootstrap.min.css\">\n" + + " <link rel=\"stylesheet\" href=\"css/exonerator.css\">\n" + + " <link href=\"images/favicon.ico\" type=\"image/x-icon\" " + "rel=\"icon\">\n" - + "</head>\n" - + "<body>\n" - + "<div class=\"container\">\n" - + "<div class=\"row\">\n" - + "<div class=\"col-xs-12\">\n" - + "<div class=\"page-header\">\n" - + "<h1><a href=\"/\">ExoneraTor</a></h1>\n" - + "</div>\n" - + "</div>\n" - + "</div>\n"); + + " </head>\n" + + " <body>\n" + + " <div class=\"container\">\n" + + " <div class=\"row\">\n" + + " <div class=\"col-xs-12\">\n" + + " <div class=\"page-header\">\n" + + " <h1><a href=\"/\">ExoneraTor</a></h1>\n" + + " </div>\n" + + " </div>\n" + + " </div>\n"); } private void writeForm(PrintWriter out, ResourceBundle rb, @@ -545,31 +546,33 @@ public class ExoneraTorServlet extends HttpServlet { ipValue = String.format(" value=\"%s\"", relayIP); } } - out.printf("<div class=\"row\">\n" - + "<div class=\"col-xs-12\">\n" - + "<div class=\"text-center\">\n" - + "<div class=\"row vbottom15\">\n" - + "<h4>%s</h4>\n" - + "</div> \n" - + "<form class=\"form-inline\">\n" - + "<div class=\"form-group%s\">\n" - + "<label for=\"inputIp\" class=\"control-label\">%s</label>\n" - + "<input type=\"text\" class=\"form-control\" name=\"ip\" " - + "id=\"inputIp\" placeholder=\"86.59.21.38\"%s required>\n" - + "</div>\n" - + "<div class=\"form-group%s\">\n" - + "<label for=\"inputTimestamp\" " + out.printf(" <div class=\"row\">\n" + + " <div class=\"col-xs-12\">\n" + + " <div class=\"text-center\">\n" + + " <div class=\"row vbottom15\">\n" + + " <h4>%s</h4>\n" + + " </div> \n" + + " <form class=\"form-inline\">\n" + + " <div class=\"form-group%s\">\n" + + " <label for=\"inputIp\" " + "class=\"control-label\">%s</label>\n" - + "<input type=\"date\" class=\"form-control\" " + + " <input type=\"text\" class=\"form-control\" " + + "name=\"ip\" id=\"inputIp\" placeholder=\"86.59.21.38\"%s " + + "required>\n" + + " </div>\n" + + " <div class=\"form-group%s\">\n" + + " <label for=\"inputTimestamp\" " + + "class=\"control-label\">%s</label>\n" + + " <input type=\"date\" class=\"form-control\" " + "name=\"timestamp\" id=\"inputTimestamp\" " + "placeholder=\"2010-01-01\"%s required>\n" - + "</div>\n" - + "<button type=\"submit\" " + + " </div>\n" + + " <button type=\"submit\" " + "class=\"btn btn-primary\">%s</button>\n" - + "</form>\n" - + "</div>\n" - + "</div>\n" - + "</div>\n", + + " </form>\n" + + " </div>\n" + + " </div>\n" + + " </div>\n", rb.getString("form.explanation"), relayIPHasError ? " has-error" : "", rb.getString("form.ip.label"), @@ -719,27 +722,28 @@ public class ExoneraTorServlet extends HttpServlet { String panelContext, String panelTitle, Object[][] panelItems, String panelBodyTemplate, Object... panelBodyArgs) throws IOException { - out.printf("<div class=\"row\">\n" - + "<div class=\"col-xs-12\">\n" - + "<h2>%s</h2>\n" - + "<div class=\"panel %s\">\n" - + "<div class=\"panel-heading\">\n" - + "<h3 class=\"panel-title\">%s</h3>\n" - + "</div>\n" - + "<div class=\"panel-body\">\n" - + "<p>%s</p>\n", heading, panelContext, panelTitle, + out.printf(" <div class=\"row\">\n" + + " <div class=\"col-xs-12\">\n" + + " <h2>%s</h2>\n" + + " <div class=\"panel %s\">\n" + + " <div class=\"panel-heading\">\n" + + " <h3 class=\"panel-title\">%s</h3>\n" + + " </div>\n" + + " <div class=\"panel-body\">\n" + + " <p>%s</p>\n", heading, panelContext, panelTitle, String.format(panelBodyTemplate, panelBodyArgs)); if (panelItems != null) { - out.print("<ul>\n"); + out.print(" <ul>\n"); for (Object[] panelItem : panelItems) { - out.printf("<li><a href=\"%s\">%s</a></li>\n", panelItem); + out.printf(" <li><a href=\"%s\">%s</a></li>\n", + panelItem); } - out.print("</ul>\n"); + out.print(" </ul>\n"); } - out.print("</div>\n" - + "</div>\n" - + "</div>\n" - + "</div>\n"); + out.print(" </div>\n" + + " </div>\n" + + " </div>\n" + + " </div>\n"); } private void writeTechnicalDetails(PrintWriter out, ResourceBundle rb, @@ -747,21 +751,21 @@ public class ExoneraTorServlet extends HttpServlet { throws IOException { String formattedRelayIP = relayIP.contains(":") ? "[" + relayIP + "]" : relayIP; - out.printf("<div class=\"row\">\n" - + "<div class=\"col-xs-12\">\n" - + "<h2>%s</h2>\n" - + "<p>%s</p>\n" - + "<table class=\"table\">\n" - + "<thead>\n" - + "<tr>\n" - + "<th>%s</th>\n" - + "<th>%s</th>\n" - + "<th>%s</th>\n" - + "<th>%s</th>\n" - + "<th>%s</th>\n" - + "</tr>\n" - + "</thead>\n" - + "<tbody>\n", + out.printf(" <div class=\"row\">\n" + + " <div class=\"col-xs-12\">\n" + + " <h2>%s</h2>\n" + + " <p>%s</p>\n" + + " <table class=\"table\">\n" + + " <thead>\n" + + " <tr>\n" + + " <th>%s</th>\n" + + " <th>%s</th>\n" + + " <th>%s</th>\n" + + " <th>%s</th>\n" + + " <th>%s</th>\n" + + " </tr>\n" + + " </thead>\n" + + " <tbody>\n", rb.getString("technicaldetails.heading"), String.format(rb.getString("technicaldetails.pre"), formattedRelayIP, timestampStr), @@ -771,7 +775,7 @@ public class ExoneraTorServlet extends HttpServlet { rb.getString("technicaldetails.colheader.nickname"), rb.getString("technicaldetails.colheader.exit")); for (String[] tableRow : tableRows) { - out.print("<tr>"); + out.print(" <tr>"); for (int i = 0; i < tableRow.length; i++) { String content = tableRow[i]; if (i == 2) { @@ -789,44 +793,41 @@ public class ExoneraTorServlet extends HttpServlet { content = rb.getString("technicaldetails.exit.no"); } } - out.print("<td>" + content + "</td>"); + out.print(" <td>" + content + "</td>"); } - out.print("</tr>\n"); + out.print(" </tr>\n"); } - out.print("</tr>\n" - + "</tbody>\n" - + "</table>\n" - + "</div>\n" - + "</div>\n"); + out.print(" </tbody>\n" + + " </table>\n" + + " </div>\n" + + " </div>\n"); } private void writePermanentLink(PrintWriter out, ResourceBundle rb, String relayIP, String timestampStr) throws IOException { String encodedAddress = relayIP.contains(":") ? "[" + relayIP.replaceAll(":", "%3A") + "]" : relayIP; - out.printf("<div class=\"row\">\n" - + "<div class=\"col-xs-12\">\n" - + "<h2>%s</h2>\n" - + "<pre>https://exonerator.torproject.org/?ip=%s&" + out.printf(" <div class=\"row\">\n" + + " <div class=\"col-xs-12\">\n" + + " <h2>%s</h2>\n" + + " <pre>https://exonerator.torproject.org/?ip=%s&" + "timestamp=%s</pre>\n" - + "</div>\n" - + "</div>\n", + + " </div>\n" + + " </div>\n", rb.getString("permanentlink.heading"), encodedAddress, timestampStr); } private void writeFooter(PrintWriter out, ResourceBundle rb) throws IOException { - out.printf("</div>\n" - + "<div class=\"footer\">\n" - + "<div class=\"container\">\n" - + "<div class=\"row\">\n" - + "<div class=\"col-xs-6\">\n" - + "<h3>%s</h3>\n" - + "<p class=\"small\">\n" - + "%s\n" - + "</p>\n" - + "</div>\n", + out.printf(" </div>\n" + + " <div class=\"footer\">\n" + + " <div class=\"container\">\n" + + " <div class=\"row\">\n" + + " <div class=\"col-xs-6\">\n" + + " <h3>%s</h3>\n" + + " <p class=\"small\">%s</p>\n" + + " </div>\n", rb.getString("footer.abouttor.heading"), String.format(rb.getString("footer.abouttor.body.text"), "<a href=\"https://www.torproject.org/about/" @@ -836,23 +837,21 @@ public class ExoneraTorServlet extends HttpServlet { + rb.getString("footer.abouttor.body.link2") + "</a>", "<a href=\"https://www.torproject.org/about/contact\">" + rb.getString("footer.abouttor.body.link3") + "</a>")); - out.printf("<div class=\"col-xs-6\">\n" - + "<h3>%s</h3>\n" - + "<p class=\"small\">\n" - + "%s\n" - + "</p>\n" - + "</div>\n" - + "</div>\n" - + "<div class=\"row\">\n", + out.printf(" <div class=\"col-xs-6\">\n" + + " <h3>%s</h3>\n" + + " <p class=\"small\">%s</p>\n" + + " </div>\n" + + " </div>\n" + + " <div class=\"row\">\n", rb.getString("footer.aboutexonerator.heading"), rb.getString("footer.aboutexonerator.body")); - out.printf("<div class=\"col-xs-12\">\n" - + "<p class=\"text-center small\">%s</p>\n" - + "</div>\n" - + "</div>\n" - + "</div>\n" - + "</div>\n" - + "</body>\n" + out.printf(" <div class=\"col-xs-12\">\n" + + " <p class=\"text-center small\">%s</p>\n" + + " </div>\n" + + " </div>\n" + + " </div>\n" + + " </div>\n" + + " </body>\n" + "</html>\n", String.format(rb.getString("footer.trademark.text"), "<a href=\"https://www.torproject.org/docs/"

1 0

[exonerator/master] Apply style changes based on suggestions by Joshua Lee Tucker.
by karsten＠torproject.org 17 Jul '15

17 Jul '15

commit 6337bdaa110b6a5e8b10b2dbf1f3d997d7010e3a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jul 17 17:25:42 2015 +0200 Apply style changes based on suggestions by Joshua Lee Tucker. --- res/ExoneraTor.properties | 1 + res/ExoneraTor_de.properties | 1 + .../torproject/exonerator/ExoneraTorServlet.java | 11 +++++++++- web/css/exonerator.css | 21 ++++++++++++++++++++ 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/res/ExoneraTor.properties b/res/ExoneraTor.properties index 8174e5e..aea0367 100644 --- a/res/ExoneraTor.properties +++ b/res/ExoneraTor.properties @@ -1,3 +1,4 @@ +form.explanation=Enter an IP address and date to find out whether that address was used by a Tor relay: form.ip.label=IP address form.timestamp.label=Date form.search.label=Search diff --git a/res/ExoneraTor_de.properties b/res/ExoneraTor_de.properties index 4247ddd..8715666 100644 --- a/res/ExoneraTor_de.properties +++ b/res/ExoneraTor_de.properties @@ -1,3 +1,4 @@ +form.explanation=Geben Sie eine IP-Adresse und ein Datum ein um herauszufinden, ob diese IP-Adresse von einem Tor-Relay verwendet wurde: form.ip.label=IP-Adresse form.timestamp.label=Datum form.search.label=Suchen diff --git a/src/org/torproject/exonerator/ExoneraTorServlet.java b/src/org/torproject/exonerator/ExoneraTorServlet.java index 7d87fd6..47947c7 100644 --- a/src/org/torproject/exonerator/ExoneraTorServlet.java +++ b/src/org/torproject/exonerator/ExoneraTorServlet.java @@ -519,6 +519,7 @@ public class ExoneraTorServlet extends HttpServlet { + "initial-scale=1\">\n" + "<title>ExoneraTor</title>\n" + "<link rel=\"stylesheet\" href=\"css/bootstrap.min.css\">\n" + + "<link rel=\"stylesheet\" href=\"css/exonerator.css\">\n" + "<link href=\"images/favicon.ico\" type=\"image/x-icon\" " + "rel=\"icon\">\n" + "</head>\n" @@ -547,6 +548,9 @@ public class ExoneraTorServlet extends HttpServlet { out.printf("<div class=\"row\">\n" + "<div class=\"col-xs-12\">\n" + "<div class=\"text-center\">\n" + + "<div class=\"row vbottom15\">\n" + + "<h4>%s</h4>\n" + + "</div> \n" + "<form class=\"form-inline\">\n" + "<div class=\"form-group%s\">\n" + "<label for=\"inputIp\" class=\"control-label\">%s</label>\n" @@ -566,6 +570,7 @@ public class ExoneraTorServlet extends HttpServlet { + "</div>\n" + "</div>\n" + "</div>\n", + rb.getString("form.explanation"), relayIPHasError ? " has-error" : "", rb.getString("form.ip.label"), ipValue, @@ -812,7 +817,10 @@ public class ExoneraTorServlet extends HttpServlet { private void writeFooter(PrintWriter out, ResourceBundle rb) throws IOException { - out.printf("<div class=\"row\">\n" + out.printf("</div>\n" + + "<div class=\"footer\">\n" + + "<div class=\"container\">\n" + + "<div class=\"row\">\n" + "<div class=\"col-xs-6\">\n" + "<h3>%s</h3>\n" + "<p class=\"small\">\n" @@ -843,6 +851,7 @@ public class ExoneraTorServlet extends HttpServlet { + "</div>\n" + "</div>\n" + "</div>\n" + + "</div>\n" + "</body>\n" + "</html>\n", String.format(rb.getString("footer.trademark.text"), diff --git a/web/css/exonerator.css b/web/css/exonerator.css new file mode 100644 index 0000000..dfa4767 --- /dev/null +++ b/web/css/exonerator.css @@ -0,0 +1,21 @@ +html { + position: relative; + min-height: 100%; +} + +body { + margin: 0 0 200px; /* bottom = footer height */ +} + +.footer { + position: absolute; + left: 0; + bottom: 0; + height: 200px; + width: 100%; +} + +.vbottom15 { + margin-bottom: 15px; +} +

1 0

[tor/master] Start changelog sections that are straight copies from 0.2.6
by nickm＠torproject.org 16 Jul '15

16 Jul '15

commit 579a73c9bc3f9c71308541f4df6f19430fa7412a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 16 15:55:54 2015 -0400 Start changelog sections that are straight copies from 0.2.6 --- ChangeLog | 68 +++++++++++++++++++++++++++++ changes/bug16013 | 5 --- changes/bug16030 | 3 -- changes/bug16164 | 4 -- changes/bug16212 | 5 --- changes/bug16244 | 7 --- changes/bug16247 | 5 --- changes/bug16360-failed-crypto-early-init | 7 --- changes/bug16363 | 4 -- changes/bug16381 | 13 ------ changes/bug16400 | 5 --- changes/geoip-june2015 | 3 -- changes/geoip6-june2015 | 3 -- changes/ticket8243 | 7 --- 14 files changed, 68 insertions(+), 71 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa53893..af3b00d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,73 @@ Changes in version 0.2.7.2-alpha - 2015-07-?? + o Major bugfixes (client-side privacy, also in 0.2.6.9): + - Properly separate out each SOCKSPort when applying stream + isolation. The error occurred because each port's session group was + being overwritten by a default value when the listener connection + was initialized. Fixes bug 16247; bugfix on 0.2.6.3-alpha. Patch + by "jojelino". + + o Minor feature (directory authorities, security, also in 0.2.6.9): + - The HSDir flag given by authorities now requires the Stable flag. + For the current network, this results in going from 2887 to 2806 + HSDirs. Also, it makes it harder for an attacker to launch a sybil + attack by raising the effort for a relay to become Stable which + takes at the very least 7 days to do so and by keeping the 96 + hours uptime requirement for HSDir. Implements ticket 8243. + + o Minor bugfixes (compilation, also in 0.2.6.9): + - Build with --enable-systemd correctly when libsystemd is + installed, but systemd is not. Fixes bug 16164; bugfix on + 0.2.6.3-alpha. Patch from Peter Palfrader. + + o Minor bugfixes (Linux seccomp2 sandbox, also in 0.2.6.9): + - Fix sandboxing to work when running as a relaymby renaming of + secret_id_key, and allowing the eventfd2 and futex syscalls. Fixes + bug 16244; bugfix on 0.2.6.1-alpha. Patch by Peter Palfrader. + - Allow systemd connections to work with the Linux seccomp2 sandbox + code. Fixes bug 16212; bugfix on 0.2.6.2-alpha. Patch by + Peter Palfrader. + + o Minor bugfixes (tests, also in 0.2.6.9): + - Fix a crash in the unit tests when built with MSVC2013. Fixes bug + 16030; bugfix on 0.2.6.2-alpha. Patch from "NewEraCracker". + + o Major bugfixes (hidden service clients, stability, also in 0.2.6.10): + - Stop refusing to store updated hidden service descriptors on a + client. This reverts commit 9407040c59218 (which indeed fixed bug + 14219, but introduced a major hidden service reachability + regression detailed in bug 16381). This is a temporary fix since + we can live with the minor issue in bug 14219 (it just results in + some load on the network) but the regression of 16381 is too much + of a setback. First-round fix for bug 16381; bugfix + on 0.2.6.3-alpha. + + o Major bugfixes (stability, also in 0.2.6.10): + - Stop crashing with an assertion failure when parsing certain kinds + of malformed or truncated microdescriptors. Fixes bug 16400; + bugfix on 0.2.6.1-alpha. Found by "torkeln"; fix based on a patch + by "cypherpunks_backup". + - Stop random client-side assertion failures that could occur when + connecting to a busy hidden service, or connecting to a hidden + service while a NEWNYM is in progress. Fixes bug 16013; bugfix + on 0.1.0.1-rc. + + o Minor features (geoip, also in 0.2.6.10): + - Update geoip to the June 3 2015 Maxmind GeoLite2 Country database. + - Update geoip6 to the June 3 2015 Maxmind GeoLite2 Country database. + + o Minor bugfixes (crypto error-handling, also in 0.2.6.10): + - Check for failures from crypto_early_init, and refuse to continue. + A previous typo meant that we could keep going with an + uninitialized crypto library, and would have OpenSSL initialize + its own PRNG. Fixes bug 16360; bugfix on 0.2.5.2-alpha, introduced + when implementing ticket 4900. Patch by "teor". + + o Minor bugfixes (Linux seccomp2 sandbox, also in 0.2.6.10): + - Allow pipe() and pipe2() syscalls in the seccomp2 sandbox: we need + these when eventfd2() support is missing. Fixes bug 16363; bugfix + on 0.2.6.3-alpha. Patch from "teor". + Changes in version 0.2.6.10 - 2015-07-12 Tor version 0.2.6.10 fixes some significant stability and hidden diff --git a/changes/bug16013 b/changes/bug16013 deleted file mode 100644 index d194c60..0000000 --- a/changes/bug16013 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes (hidden service, stability): - - Stop randomly crashing with an assertion failure when connecting to a - busy hidden service, or connecting to a hidden service while a NEWNYM - is in progress. Fixes bug 16013; bugfix on 0.1.0.1-rc. - diff --git a/changes/bug16030 b/changes/bug16030 deleted file mode 100644 index c14fd62..0000000 --- a/changes/bug16030 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (tests): - - Fix a crash in the unit tests on MSVC2013. Fixes bug 16030; bugfix on - 0.2.6.2-alpha. Patch from "NewEraCracker". \ No newline at end of file diff --git a/changes/bug16164 b/changes/bug16164 deleted file mode 100644 index fbb383c..0000000 --- a/changes/bug16164 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (compilation): - - Build with --enable-systemd correctly when libsystemd is installed, - but systemd is not. Fixes bug 16164, bugfix on 0.2.6.3-alpha. Patch - from Peter Palfrader. diff --git a/changes/bug16212 b/changes/bug16212 deleted file mode 100644 index bc12463..0000000 --- a/changes/bug16212 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (sandbox, systemd): - - Allow systemd connections to work with the Linux seccomp2 sandbox - code. Fixes bug 16212; bugfix on 0.2.6.2-alpha. - Patch by Peter Palfrader. - diff --git a/changes/bug16244 b/changes/bug16244 deleted file mode 100644 index 00bc557..0000000 --- a/changes/bug16244 +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes (sandbox, relay): - - Fix sandboxing to work when running as a relay again. This - includes correctly allowing renaming secret_id_key and - allowing the eventfd2 and futex syscalls. - Fixes bug 16244; bugfix on 0.2.6.1-alpha. - Patch by Peter Palfrader. - diff --git a/changes/bug16247 b/changes/bug16247 deleted file mode 100644 index 9464b1c..0000000 --- a/changes/bug16247 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (client-side privacy): - - Properly separate out each SOCKSPort when applying stream isolation. - The error occured because each port's session group was being - overwritten by a default value. Fixes bug 16247; bugfix on - 0.2.6.3-alpha. Patch by "jojelino". diff --git a/changes/bug16360-failed-crypto-early-init b/changes/bug16360-failed-crypto-early-init deleted file mode 100644 index 21972bc..0000000 --- a/changes/bug16360-failed-crypto-early-init +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes (crypto error-handling): - - If crypto_early_init fails, a typo in a return value from tor_init - means that tor_main continues running, rather than returning - an error value. - Fixes bug 16360; bugfix on d3fb846d8c98 in 0.2.5.2-alpha, - introduced when implementing #4900. - Patch by "teor". diff --git a/changes/bug16363 b/changes/bug16363 deleted file mode 100644 index 1a6f8c6..0000000 --- a/changes/bug16363 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (Linux seccomp2 sandbox): - - Allow pipe() and pipe2() syscalls; we need these when eventfd2() - support is missing. Fixes bug 16363; bugfix on 0.2.6.3-alpha. - Patch from "teor". diff --git a/changes/bug16381 b/changes/bug16381 deleted file mode 100644 index 51a9b53..0000000 --- a/changes/bug16381 +++ /dev/null @@ -1,13 +0,0 @@ - o Major bugfix (Hidden service client) - - Revert commit 9407040c592184e05e45a3c1a00739c2dd302288 of bug #14219 - that indeed fixed an issue but introduced a major hidden service - reachability regression detailed in bug #16381. This is a temporary - fix since we can live with the minor issue in #14219 but the - regression introduced is too much of a set back. - - To be clear, #14219 bug just results in some load on the network, and - some delay for the client when visiting a hidden service that will - ultimately fail. - - This is only a bandaid for #16381 thus it does _not_ fixes it. bugfix - on tor-0.2.6.3-alpha~138. diff --git a/changes/bug16400 b/changes/bug16400 deleted file mode 100644 index 3e5f9c5..0000000 --- a/changes/bug16400 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes: - - Do not crash with an assertion error when parsing certain kinds - of malformed or truncated microdescriptors. Fixes bug 16400; - bugfix on 0.2.6.1-alpha. Found by "torkeln"; fix based on a patch by - "cypherpunks_backup". diff --git a/changes/geoip-june2015 b/changes/geoip-june2015 deleted file mode 100644 index 9d6cd36..0000000 --- a/changes/geoip-june2015 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update geoip to the June 3 2015 Maxmind GeoLite2 Country database. - diff --git a/changes/geoip6-june2015 b/changes/geoip6-june2015 deleted file mode 100644 index 527dbff..0000000 --- a/changes/geoip6-june2015 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update geoip6 to the June 3 2015 Maxmind GeoLite2 Country database. - diff --git a/changes/ticket8243 b/changes/ticket8243 deleted file mode 100644 index 8946a21..0000000 --- a/changes/ticket8243 +++ /dev/null @@ -1,7 +0,0 @@ - o Minor feature: - - The HSDir flag given by authorities now requires the Stable flag. For - the current network, this results in going from 2887 to 2806 HSDirs. - Also, it makes it harder for an attacker to launch a sybil attack by - raising the effort for a relay to become Stable which takes at the - very least 7 days to do so and by keeping the 96 hours uptime - requirement for HSDir. Implements ticket #8243.

1 0

[tor/master] Make all changes files work with lintChanges
by nickm＠torproject.org 16 Jul '15

16 Jul '15

commit 515de3ac1947455d60d1eb873ecb6fa45729076b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 16 16:04:56 2015 -0400 Make all changes files work with lintChanges --- changes/bug12498 | 4 ++-- changes/bug15881 | 5 +++-- changes/bug16115-NULL-getinfo-onions | 3 +-- changes/bug16115-init-var | 2 +- changes/bug16115-signing-key-NULL-check | 6 ------ changes/bug16115-spawn-comment | 6 ------ changes/bug16115-undef-directive-in-macro | 3 +-- changes/bug16115-unused-find-cipher | 7 ------- changes/bug16260 | 6 +++--- changes/bug16288 | 2 +- changes/bug16515-sandbox-cloexec | 2 +- changes/bug16543 | 2 +- changes/bug4862 | 4 ++-- changes/feature15817-clang-sanitizers | 2 +- changes/ticket15358 | 6 +++--- changes/ticket16034 | 1 + changes/ticket16140 | 1 + changes/ticket16189 | 12 ++++++------ 18 files changed, 28 insertions(+), 46 deletions(-) diff --git a/changes/bug12498 b/changes/bug12498 index 9f0147c..185ba46 100644 --- a/changes/bug12498 +++ b/changes/bug12498 @@ -1,9 +1,9 @@ - o Major features (Ed25519 identity keys: #12498, Prop220): + o Major features (Ed25519 identity keys, Prop220): - All relays now maintain a stronger identity key, using the Ed25519 elliptic curve signature format. This master key is designed so that it can be kept offline. Relays also generate an online signing key, and a set of other Ed25519 keys and certificates. - These are all automatically regenerated and rotated as needed. + These are all automatically regenerated and rotated as needed. - Directory authorities track which Ed25519 identity keys have been used with which RSA1024 identity keys, and do not allow them to vary freely. diff --git a/changes/bug15881 b/changes/bug15881 index 5cf561e..b0dcb2f 100644 --- a/changes/bug15881 +++ b/changes/bug15881 @@ -1,3 +1,4 @@ - o Controller fixes: + o Minor bugfixes (controller): - Add the descriptor ID in each HS_DESC control event. It was missing - but specified in control-spec.txt. Fixes ticket 15881. + but specified in control-spec.txt. Fixes bug 15881; bugfix + on 0.2.5.2-alpha. diff --git a/changes/bug16115-NULL-getinfo-onions b/changes/bug16115-NULL-getinfo-onions index ec1661e..40983b3 100644 --- a/changes/bug16115-NULL-getinfo-onions +++ b/changes/bug16115-NULL-getinfo-onions @@ -1,4 +1,3 @@ o Minor fixes (threads, comments): - Check for NULL values in getinfo_helper_onions - Patch by "teor". - Fix on 915c7438a77e in Tor 0.2.7.1-alpha. + Patch by "teor". Fixes part of bug 16115; bugfix on 0.2.7.1-alpha. diff --git a/changes/bug16115-init-var b/changes/bug16115-init-var index e3e924a..e29bb13 100644 --- a/changes/bug16115-init-var +++ b/changes/bug16115-init-var @@ -1,4 +1,4 @@ o Minor fixes (threads, comments): - Always initialise return value in compute_desc_id in rendcommon.c Patch by "teor". - Fix on e6a581f126ba, released in 0.2.7.1-alpha. + Fixes part of bug 16115; bugfix on 0.2.7.1-alpha. diff --git a/changes/bug16115-signing-key-NULL-check b/changes/bug16115-signing-key-NULL-check deleted file mode 100644 index 3d4f05b..0000000 --- a/changes/bug16115-signing-key-NULL-check +++ /dev/null @@ -1,6 +0,0 @@ - o Minor fixes (threads, comments): - - Ensure signing_key is non-NULL before accessing one of its members - signing_key can be NULL in ed_key_init_from_file in routerkeys.c. - Discovered by clang 3.7 address sanitizer. - Patch by "teor". - Fix on c03694938ed0, not in any released version of Tor. diff --git a/changes/bug16115-spawn-comment b/changes/bug16115-spawn-comment deleted file mode 100644 index 7792564..0000000 --- a/changes/bug16115-spawn-comment +++ /dev/null @@ -1,6 +0,0 @@ - o Minor fixes (threads, comments): - - Fix an incorrect comment on spawn_func in compat_pthreads.c. - spawn_func calls pthread_create on unix, not fork - Patch by "teor". - Bugfix on unknown tor version (existing code split out of - compat.c into compat_pthreads.c in c2f0d52b7fb9 on 22 Sep 2013). diff --git a/changes/bug16115-undef-directive-in-macro b/changes/bug16115-undef-directive-in-macro index 8031267..17aac1f 100644 --- a/changes/bug16115-undef-directive-in-macro +++ b/changes/bug16115-undef-directive-in-macro @@ -2,5 +2,4 @@ - Remove undefined directive-in-macro in test_util_writepid clang 3.7 complains that using a preprocessor directive inside a macro invocation in test_util_writepid in test_util.c is undefined. - Patch by "teor". - Fix on 79e85313aa61 on 0.2.7.1-alpha. + Patch by "teor". Fixes part of bug 16115; bugfix on 0.2.7.1-alpha. diff --git a/changes/bug16115-unused-find-cipher b/changes/bug16115-unused-find-cipher deleted file mode 100644 index 0f04d67..0000000 --- a/changes/bug16115-unused-find-cipher +++ /dev/null @@ -1,7 +0,0 @@ - o Minor fixes (threads, comments): - - Silence unused variable warnings in find_cipher_by_id - Unused variable warnings were still generated under some versions - of OpenSSL. Instead, make sure all variables are used under all - versions of OpenSSL. - Patch by "teor". - Fix on 496df21c89d1, not in any released version of tor. diff --git a/changes/bug16260 b/changes/bug16260 index a75cb1d..a2797b8 100644 --- a/changes/bug16260 +++ b/changes/bug16260 @@ -4,8 +4,8 @@ current circuit exit node which resulted in changing the original intro point choice. This resulted in the hidden service skipping excluded nodes like for instance reconnecting to an expired intro - point.; Fixes #16260; bugfixes on tor-0.1.0.1-rc~460. + point. Fixes bug 16260; bugfix on 0.1.0.1-rc. This is particularly important for the introduction point retry - behavior (#8239) since cannibalization is allowed, which is desired, - so it's important to pin the chosen exit point. + behavior (see bug 8239) since cannibalization is allowed, which is + desired, so it's important to pin the chosen exit point. diff --git a/changes/bug16288 b/changes/bug16288 index 7ddf615..b3cfaa0 100644 --- a/changes/bug16288 +++ b/changes/bug16288 @@ -3,4 +3,4 @@ tor_accept_socket_nonblocking() which made tor go beyond the open file limit set previously. With this fix, before opening a new socket, tor validates the open file limit just before and if the max has been - reached, return EMFILE.; Fixes #16288; bugfix on tor-0.1.1.1-alpha~74. + reached, return EMFILE. Fixes bug 16288; bugfix on 0.1.1.1-alpha. diff --git a/changes/bug16515-sandbox-cloexec b/changes/bug16515-sandbox-cloexec index 2130f85..c667f4b 100644 --- a/changes/bug16515-sandbox-cloexec +++ b/changes/bug16515-sandbox-cloexec @@ -1,3 +1,3 @@ o Minor fixes (sandbox, files): - Use the sandbox in tor_open_cloexec whether or not O_CLOEXEC is defined. - Patch by "teor". Fix on 0.2.3.1-alpha. + Patch by "teor". Fixes bug 16515; bugfix on 0.2.3.1-alpha. diff --git a/changes/bug16543 b/changes/bug16543 index 6f77eaa..b252833 100644 --- a/changes/bug16543 +++ b/changes/bug16543 @@ -1,4 +1,4 @@ - - Removed features: + o Removed features: - Remove the HidServDirectoryV2 option. Now all relays offer to store hidden service descriptors. Related to 16543. - Remove the VoteOnHidServDirectoriesV2 option, since all authorities diff --git a/changes/bug4862 b/changes/bug4862 index e636395..f92d79d 100644 --- a/changes/bug4862 +++ b/changes/bug4862 @@ -2,7 +2,7 @@ - Remove the introduction point adaptative algorithm which is leaking popularity by changing the amount of introduction points depending on the amount of traffic the HS sees. With this, we stick to only 3 - introduction points. + introduction points. Closes ticket 4862. - Add the torrc option HiddenServiceNumIntroductionPoints for an operatory to specify a fix amount of introduction points. Maximum - value is 10 and default is 3. + value is 10 and default is 3. Closes ticket 4862. diff --git a/changes/feature15817-clang-sanitizers b/changes/feature15817-clang-sanitizers index 8bdf061..0010bd6 100644 --- a/changes/feature15817-clang-sanitizers +++ b/changes/feature15817-clang-sanitizers @@ -4,4 +4,4 @@ Add clang dynamic sanitizer blacklist in contrib/clang/sanitizer_blacklist.txt to exempt known undefined behavior. Include detailed usage instructions in the blacklist. - Patch by "teor". + Patch by "teor". Closes ticket 15817. diff --git a/changes/ticket15358 b/changes/ticket15358 index 8c85d51..5b17586 100644 --- a/changes/ticket15358 +++ b/changes/ticket15358 @@ -1,3 +1,3 @@ - o Features (control protocl): - - Support network-liveness GETINFO key and NETWORK_LIVENESS events in the - control protocol. Resolves ticket #15358. + o Features (control protocl): + - Support network-liveness GETINFO key and NETWORK_LIVENESS events in the + control protocol. Resolves ticket 15358. diff --git a/changes/ticket16034 b/changes/ticket16034 index b909946..a8546ef 100644 --- a/changes/ticket16034 +++ b/changes/ticket16034 @@ -4,3 +4,4 @@ are on an operating system that has not upgraded to OpenSSL 1.0 or later, and you compile Tor from source, you will need to install a more recent OpenSSL to link Tor against.) + Resolves ticket 16034. diff --git a/changes/ticket16140 b/changes/ticket16140 index 00c19f1..2798671 100644 --- a/changes/ticket16140 +++ b/changes/ticket16140 @@ -4,3 +4,4 @@ Elliptic Curve Cryptography. In particular support for at least one of P256 or P224 is now required, with manual configuration needed if only P224 is available. + Resolves ticket 16140. diff --git a/changes/ticket16189 b/changes/ticket16189 index aec8e13..f07fad9 100644 --- a/changes/ticket16189 +++ b/changes/ticket16189 @@ -1,6 +1,6 @@ - o Features (crypto, testing): - - Now that OpenSSL has its own scrypt implementation, add an unit - test that checks for interoperability between libscrypt_scrypt() - and OpenSSL's EVP_PBE_scrypt() so that we could not use libscrypt - and rely on EVP_PBE_scrypt() whenever possible. Resolves ticket - 16189. + o Minor Features (crypto, testing): + - Now that OpenSSL has its own scrypt implementation, add an unit + test that checks for interoperability between libscrypt_scrypt() + and OpenSSL's EVP_PBE_scrypt() so that we could not use libscrypt + and rely on EVP_PBE_scrypt() whenever possible. Resolves ticket + 16189.

1 0

[tor/master] Add the remaining changes items to ChangeLog for 0.2.7.2-alpha
by nickm＠torproject.org 16 Jul '15

16 Jul '15

commit 60a52ed83ddc2c1591b896ce32dcdfc903031aea Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 16 16:06:25 2015 -0400 Add the remaining changes items to ChangeLog for 0.2.7.2-alpha --- ChangeLog | 238 +++++++++++++++++++++++++---- changes/8712 | 6 - changes/bug12498 | 29 ---- changes/bug15881 | 4 - changes/bug16060 | 4 - changes/bug16115-NULL-getinfo-onions | 3 - changes/bug16115-init-var | 4 - changes/bug16115-undef-directive-in-macro | 5 - changes/bug16152 | 3 - changes/bug16228 | 4 - changes/bug16260 | 11 -- changes/bug16288 | 6 - changes/bug16430 | 4 - changes/bug16470 | 3 - changes/bug16515-sandbox-cloexec | 3 - changes/bug16543 | 5 - changes/bug4862 | 8 - changes/faster-workqueue-test | 3 - changes/feature13642 | 5 - changes/feature15220 | 5 - changes/feature15817-clang-sanitizers | 7 - changes/feature16052 | 5 - changes/feature16467 | 4 - changes/feature9663 | 5 - changes/ticket15358 | 3 - changes/ticket16034 | 7 - changes/ticket16140 | 7 - changes/ticket16189 | 6 - changes/variadic_macros | 4 - changes/win-macros | 7 - 30 files changed, 209 insertions(+), 199 deletions(-) diff --git a/ChangeLog b/ChangeLog index af3b00d..5efd10c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,36 +1,45 @@ Changes in version 0.2.7.2-alpha - 2015-07-?? + o Major features: + - Add support for offline encrypted ed25519 master keys. To use this + feature on your tor relay, run "tor --keygen" to make a new master + key (or to make a new signing key if you already have a master + key). Closes ticket 13642. + + o Major feature (Hidden Service): + - Add the torrc option HiddenServiceNumIntroductionPoints for an + operatory to specify a fix amount of introduction points. Maximum + value is 10 and default is 3. Closes ticket 4862. + - Remove the introduction point adaptative algorithm which is + leaking popularity by changing the amount of introduction points + depending on the amount of traffic the HS sees. With this, we + stick to only 3 introduction points. Closes ticket 4862. + + o Major features (Ed25519 identity keys, Prop220): + - All relays now maintain a stronger identity key, using the Ed25519 + elliptic curve signature format. This master key is designed so + that it can be kept offline. Relays also generate an online + signing key, and a set of other Ed25519 keys and certificates. + These are all automatically regenerated and rotated as needed. + - Directory authorities now vote on Ed25519 identity keys along with + RSA1024 keys. + - Directory authorities track which Ed25519 identity keys have been + used with which RSA1024 identity keys, and do not allow them to + vary freely. + - Microdescriptors now include ed25519 identity keys. + + o Major features (onion key cross-certification): + - Relay descriptors now include signatures of the identity keys + using the TAP and ntor onion keys. This allows relays to prove + ownership of their own onion keys. Because of this change, + microdescriptors no longer need to include RSA identity keys. + Implements proposal 228; closes ticket 12499. o Major bugfixes (client-side privacy, also in 0.2.6.9): - Properly separate out each SOCKSPort when applying stream - isolation. The error occurred because each port's session group was - being overwritten by a default value when the listener connection - was initialized. Fixes bug 16247; bugfix on 0.2.6.3-alpha. Patch - by "jojelino". - - o Minor feature (directory authorities, security, also in 0.2.6.9): - - The HSDir flag given by authorities now requires the Stable flag. - For the current network, this results in going from 2887 to 2806 - HSDirs. Also, it makes it harder for an attacker to launch a sybil - attack by raising the effort for a relay to become Stable which - takes at the very least 7 days to do so and by keeping the 96 - hours uptime requirement for HSDir. Implements ticket 8243. - - o Minor bugfixes (compilation, also in 0.2.6.9): - - Build with --enable-systemd correctly when libsystemd is - installed, but systemd is not. Fixes bug 16164; bugfix on - 0.2.6.3-alpha. Patch from Peter Palfrader. - - o Minor bugfixes (Linux seccomp2 sandbox, also in 0.2.6.9): - - Fix sandboxing to work when running as a relaymby renaming of - secret_id_key, and allowing the eventfd2 and futex syscalls. Fixes - bug 16244; bugfix on 0.2.6.1-alpha. Patch by Peter Palfrader. - - Allow systemd connections to work with the Linux seccomp2 sandbox - code. Fixes bug 16212; bugfix on 0.2.6.2-alpha. Patch by - Peter Palfrader. - - o Minor bugfixes (tests, also in 0.2.6.9): - - Fix a crash in the unit tests when built with MSVC2013. Fixes bug - 16030; bugfix on 0.2.6.2-alpha. Patch from "NewEraCracker". + isolation. The error occurred because each port's session group + was being overwritten by a default value when the listener + connection was initialized. Fixes bug 16247; bugfix on + 0.2.6.3-alpha. Patch by "jojelino". o Major bugfixes (hidden service clients, stability, also in 0.2.6.10): - Stop refusing to store updated hidden service descriptors on a @@ -42,6 +51,14 @@ Changes in version 0.2.7.2-alpha - 2015-07-?? of a setback. First-round fix for bug 16381; bugfix on 0.2.6.3-alpha. + o Major bugfixes (open file limit): + - The max open file limit wasn't checked before calling + tor_accept_socket_nonblocking() which made tor go beyond the open + file limit set previously. With this fix, before opening a new + socket, tor validates the open file limit just before and if the + max has been reached, return EMFILE. Fixes bug 16288; bugfix + on 0.1.1.1-alpha. + o Major bugfixes (stability, also in 0.2.6.10): - Stop crashing with an assertion failure when parsing certain kinds of malformed or truncated microdescriptors. Fixes bug 16400; @@ -52,10 +69,74 @@ Changes in version 0.2.7.2-alpha - 2015-07-?? service while a NEWNYM is in progress. Fixes bug 16013; bugfix on 0.1.0.1-rc. + o Minor feature (directory authorities, security, also in 0.2.6.9): + - The HSDir flag given by authorities now requires the Stable flag. + For the current network, this results in going from 2887 to 2806 + HSDirs. Also, it makes it harder for an attacker to launch a sybil + attack by raising the effort for a relay to become Stable which + takes at the very least 7 days to do so and by keeping the 96 + hours uptime requirement for HSDir. Implements ticket 8243. + + o Minor feature (performance): + - Improve the runtime speed of Ed25519 operations by using the + public-domain ed25519-donna by Andrew M. ("floodyberry"). + Implements ticket 16467. + - Improve the runtime speed of the ntor handshake by using an + optimized curve25519 basepoint scalarmult implementation from the + public-domain ed25519-donna by Andrew M. ("floodyberry"), based on + ideas by Adam Langley. Implements ticket 9663. + + o Minor features (client): + - Relax the validation done to hostnames in SOCKS5 requests, and + allow '_' to cope with domains observed in the wild that are + serving non-RFC compliant records. Resolves ticket 16430. + + o Minor features (client, unix sockets): + - Add GroupWritable and WorldWritable options to unix-socket based + SocksPort and ControlPort options. These options apply to a single + socket, and override {Control,Socks}SocketsGroupWritable. Closes + ticket 15220. + + o Minor Features (crypto, testing): + - Now that OpenSSL has its own scrypt implementation, add an unit + test that checks for interoperability between libscrypt_scrypt() + and OpenSSL's EVP_PBE_scrypt() so that we could not use libscrypt + and rely on EVP_PBE_scrypt() whenever possible. Resolves + ticket 16189. + + o Minor features (directory authorities): + - Directory authorities no longer vote against the "Fast", "Stable", + and "HSDir" flags just because they were going to vote against + "Running": if the consensus turns out to be that the router was + running, then the authority's vote should count. Patch from Peter + Retzlaff; closes issue 8712. + o Minor features (geoip, also in 0.2.6.10): - Update geoip to the June 3 2015 Maxmind GeoLite2 Country database. - Update geoip6 to the June 3 2015 Maxmind GeoLite2 Country database. + o Minor features (hidden service): + - Add the new options "HiddenServiceMaxStreams" and + "HiddenServiceMaxStreamsCloseCircuit" to allow hidden services to + limit the maximum number of simultaneous streams per circuit, and + optionally tear down the circuit when the limit is exceeded. Part + of ticket 16052. + + o Minor features (portability): + - Use C99 variadic macros when the compiler is not GCC. This avoids + failing compilations on MSVC, and fixes a log-file-based race + condition in our old workarounds. Original patch from Gisle Vanem. + + o Minor bugfixes (compilation, also in 0.2.6.9): + - Build with --enable-systemd correctly when libsystemd is + installed, but systemd is not. Fixes bug 16164; bugfix on + 0.2.6.3-alpha. Patch from Peter Palfrader. + + o Minor bugfixes (controller): + - Add the descriptor ID in each HS_DESC control event. It was + missing but specified in control-spec.txt. Fixes bug 15881; bugfix + on 0.2.5.2-alpha. + o Minor bugfixes (crypto error-handling, also in 0.2.6.10): - Check for failures from crypto_early_init, and refuse to continue. A previous typo meant that we could keep going with an @@ -63,11 +144,110 @@ Changes in version 0.2.7.2-alpha - 2015-07-?? its own PRNG. Fixes bug 16360; bugfix on 0.2.5.2-alpha, introduced when implementing ticket 4900. Patch by "teor". + o Minor bugfixes (Hidden service): + - When cannibalizing a circuit for an introduction point, always + extend to the chosen exit node creating a 4 hop circuit instead of + using the current circuit exit node which resulted in changing the + original intro point choice. This resulted in the hidden service + skipping excluded nodes like for instance reconnecting to an + expired intro point. Fixes bug 16260; bugfix on 0.1.0.1-rc. This + is particularly important for the introduction point retry + behavior (see bug 8239) since cannibalization is allowed, which is + desired, so it's important to pin the chosen exit point. + + o Minor bugfixes (hidden service): + - Fix a crash when reloading configuration while at least one + configured and one ephemeral hidden service exists. Fixes bug + 16060; bugfix on 0.2.7.1-alpha. + + o Minor bugfixes (hidden services): + - Avoid crashing with a double-free bug when we create an ephemeral + hidden service but adding it fails for some reason. Fixes bug + 16228; bugfix on 0.2.7.1-alpha. + o Minor bugfixes (Linux seccomp2 sandbox, also in 0.2.6.10): - Allow pipe() and pipe2() syscalls in the seccomp2 sandbox: we need these when eventfd2() support is missing. Fixes bug 16363; bugfix on 0.2.6.3-alpha. Patch from "teor". + o Minor bugfixes (Linux seccomp2 sandbox, also in 0.2.6.9): + - Fix sandboxing to work when running as a relaymby renaming of + secret_id_key, and allowing the eventfd2 and futex syscalls. Fixes + bug 16244; bugfix on 0.2.6.1-alpha. Patch by Peter Palfrader. + - Allow systemd connections to work with the Linux seccomp2 sandbox + code. Fixes bug 16212; bugfix on 0.2.6.2-alpha. Patch by + Peter Palfrader. + + o Minor bugfixes (systemd): + - Fix an accidental formatting error that broke the systemd + configuration file. Fixes bug 16152; bugfix on 0.2.7.1-alpha. + + o Minor bugfixes (tests): + - Use the configured Python executable when running test-stem-full. + Fixes bug 16470; bugfix on 0.2.7.1-alpha. + + o Minor bugfixes (tests, also in 0.2.6.9): + - Fix a crash in the unit tests when built with MSVC2013. Fixes bug + 16030; bugfix on 0.2.6.2-alpha. Patch from "NewEraCracker". + + o Minor enhancements (correctness, testing): + - Document use of coverity, clang static analyzer, and clang dynamic + undefined behavior and address sanitizers in doc/HACKING. Add + clang dynamic sanitizer blacklist in + contrib/clang/sanitizer_blacklist.txt to exempt known undefined + behavior. Include detailed usage instructions in the blacklist. + Patch by "teor". Closes ticket 15817. + + o Minor fixes (sandbox, files): + - Use the sandbox in tor_open_cloexec whether or not O_CLOEXEC is + defined. Patch by "teor". Fixes bug 16515; bugfix on 0.2.3.1-alpha. + + o Minor fixes (threads, comments): + - Always initialise return value in compute_desc_id in rendcommon.c + Patch by "teor". Fixes part of bug 16115; bugfix on 0.2.7.1-alpha. + - Check for NULL values in getinfo_helper_onions Patch by "teor". + Fixes part of bug 16115; bugfix on 0.2.7.1-alpha. + - Remove undefined directive-in-macro in test_util_writepid clang + 3.7 complains that using a preprocessor directive inside a macro + invocation in test_util_writepid in test_util.c is undefined. + Patch by "teor". Fixes part of bug 16115; bugfix on 0.2.7.1-alpha. + + o Code simplification and refactoring: + - Define WINVER and _WIN32_WINNT centrally, in orconfig.h, in order + to ensure they remain consistent and visible everywhere. + - Remove some vestigial workarounds for the MSVC6 compiler. We + haven't supported that in ages. + - The link authentication code has been refactored for better + testability and reliability. It now uses code generated with the + "trunnel" binary encoding generator, to reduce the risk of bugs + due to programmer error. Done as part of ticket 12498. + + o Removed features: + - Remove the HidServDirectoryV2 option. Now all relays offer to + store hidden service descriptors. Related to 16543. + - Remove the VoteOnHidServDirectoriesV2 option, since all + authorities have long set it to 1. Closes ticket 16543. + - Tor no longer supports copies of OpenSSL that are missing support + for Elliptic Curve Cryptography. In particular support for at + least one of P256 or P224 is now required, with manual + configuration needed if only P224 is available. Resolves + ticket 16140. + - Tor no longer supports versions of OpenSSL before 1.0. (If you are + on an operating system that has not upgraded to OpenSSL 1.0 or + later, and you compile Tor from source, you will need to install a + more recent OpenSSL to link Tor against.) Resolves ticket 16034. + + o Testing: + - The link authentication protocol code now has extensive tests. + - The relay descriptor signature testing code now has + extensive tests. + - The test_workqueue program now runs faster, and is enabled by + default as a part of "make check". + + o Features (control protocl): + - Support network-liveness GETINFO key and NETWORK_LIVENESS events + in the control protocol. Resolves ticket 15358. + Changes in version 0.2.6.10 - 2015-07-12 Tor version 0.2.6.10 fixes some significant stability and hidden diff --git a/changes/8712 b/changes/8712 deleted file mode 100644 index c7423e8..0000000 --- a/changes/8712 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor features (directory authorities): - - Directory authorities no longer vote against the "Fast", - "Stable", and "HSDir" flags just because they were going to vote - against "Running": if the consensus turns out to be that the - router was running, then the authority's vote should count. - Patch from Peter Retzlaff; closes issue 8712. \ No newline at end of file diff --git a/changes/bug12498 b/changes/bug12498 deleted file mode 100644 index 185ba46..0000000 --- a/changes/bug12498 +++ /dev/null @@ -1,29 +0,0 @@ - o Major features (Ed25519 identity keys, Prop220): - - All relays now maintain a stronger identity key, using the - Ed25519 elliptic curve signature format. This master key is - designed so that it can be kept offline. Relays also generate - an online signing key, and a set of other Ed25519 keys and certificates. - These are all automatically regenerated and rotated as needed. - - Directory authorities track which Ed25519 identity keys have been - used with which RSA1024 identity keys, and do not allow them to vary - freely. - - Directory authorities now vote on Ed25519 identity keys along with - RSA1024 keys. - - Microdescriptors now include ed25519 identity keys. - - o Major features (onion key cross-certification): - - Relay descriptors now include signatures of the identity keys using - the TAP and ntor onion keys. This allows relays to prove ownership of - their own onion keys. Because of this change, microdescriptors no longer - need to include RSA identity keys. Implements proposal 228; - closes ticket 12499. - - o Code simplification and refactoring: - - The link authentication code has been refactored for better testability - and reliability. It now uses code generated with the "trunnel" - binary encoding generator, to reduce the risk of bugs due to - programmer error. Done as part of ticket 12498. - - o Testing: - - The link authentication protocol code now has extensive tests. - - The relay descriptor signature testing code now has extensive tests. diff --git a/changes/bug15881 b/changes/bug15881 deleted file mode 100644 index b0dcb2f..0000000 --- a/changes/bug15881 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (controller): - - Add the descriptor ID in each HS_DESC control event. It was missing - but specified in control-spec.txt. Fixes bug 15881; bugfix - on 0.2.5.2-alpha. diff --git a/changes/bug16060 b/changes/bug16060 deleted file mode 100644 index eb0b50f..0000000 --- a/changes/bug16060 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (hidden service): - - Fix a crash when reloading configuration while at least one - configured and one ephemeral hidden service exists. Fixes bug 16060; - bugfix on 0.2.7.1-alpha. diff --git a/changes/bug16115-NULL-getinfo-onions b/changes/bug16115-NULL-getinfo-onions deleted file mode 100644 index 40983b3..0000000 --- a/changes/bug16115-NULL-getinfo-onions +++ /dev/null @@ -1,3 +0,0 @@ - o Minor fixes (threads, comments): - - Check for NULL values in getinfo_helper_onions - Patch by "teor". Fixes part of bug 16115; bugfix on 0.2.7.1-alpha. diff --git a/changes/bug16115-init-var b/changes/bug16115-init-var deleted file mode 100644 index e29bb13..0000000 --- a/changes/bug16115-init-var +++ /dev/null @@ -1,4 +0,0 @@ - o Minor fixes (threads, comments): - - Always initialise return value in compute_desc_id in rendcommon.c - Patch by "teor". - Fixes part of bug 16115; bugfix on 0.2.7.1-alpha. diff --git a/changes/bug16115-undef-directive-in-macro b/changes/bug16115-undef-directive-in-macro deleted file mode 100644 index 17aac1f..0000000 --- a/changes/bug16115-undef-directive-in-macro +++ /dev/null @@ -1,5 +0,0 @@ - o Minor fixes (threads, comments): - - Remove undefined directive-in-macro in test_util_writepid - clang 3.7 complains that using a preprocessor directive inside - a macro invocation in test_util_writepid in test_util.c is undefined. - Patch by "teor". Fixes part of bug 16115; bugfix on 0.2.7.1-alpha. diff --git a/changes/bug16152 b/changes/bug16152 deleted file mode 100644 index 8b93a60..0000000 --- a/changes/bug16152 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (systemd): - - Fix an accidental formatting error that broke the systemd - configuration file. Fixes bug 16152; bugfix on 0.2.7.1-alpha. diff --git a/changes/bug16228 b/changes/bug16228 deleted file mode 100644 index bf36cf8..0000000 --- a/changes/bug16228 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (hidden services): - - Avoid crashing with a double-free bug when we create an - ephemeral hidden service but adding it fails for some reason. - Fixes bug 16228; bugfix on 0.2.7.1-alpha. diff --git a/changes/bug16260 b/changes/bug16260 deleted file mode 100644 index a2797b8..0000000 --- a/changes/bug16260 +++ /dev/null @@ -1,11 +0,0 @@ - o Minor bugfix (Hidden service) - - When cannibalizing a circuit for an introduction point, always extend - to the chosen exit node creating a 4 hop circuit instead of using the - current circuit exit node which resulted in changing the original - intro point choice. This resulted in the hidden service skipping - excluded nodes like for instance reconnecting to an expired intro - point. Fixes bug 16260; bugfix on 0.1.0.1-rc. - - This is particularly important for the introduction point retry - behavior (see bug 8239) since cannibalization is allowed, which is - desired, so it's important to pin the chosen exit point. diff --git a/changes/bug16288 b/changes/bug16288 deleted file mode 100644 index b3cfaa0..0000000 --- a/changes/bug16288 +++ /dev/null @@ -1,6 +0,0 @@ - o Major bugfixes (open file limit): - - The max open file limit wasn't checked before calling - tor_accept_socket_nonblocking() which made tor go beyond the open - file limit set previously. With this fix, before opening a new socket, - tor validates the open file limit just before and if the max has been - reached, return EMFILE. Fixes bug 16288; bugfix on 0.1.1.1-alpha. diff --git a/changes/bug16430 b/changes/bug16430 deleted file mode 100644 index ca7b874..0000000 --- a/changes/bug16430 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (client): - - Relax the validation done to hostnames in SOCKS5 requests, and allow - '_' to cope with domains observed in the wild that are serving non-RFC - compliant records. Resolves ticket 16430. diff --git a/changes/bug16470 b/changes/bug16470 deleted file mode 100644 index 3d1b419..0000000 --- a/changes/bug16470 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (tests): - - Use the configured Python executable when running test-stem-full. Fixes - bug 16470; bugfix on 0.2.7.1-alpha. diff --git a/changes/bug16515-sandbox-cloexec b/changes/bug16515-sandbox-cloexec deleted file mode 100644 index c667f4b..0000000 --- a/changes/bug16515-sandbox-cloexec +++ /dev/null @@ -1,3 +0,0 @@ - o Minor fixes (sandbox, files): - - Use the sandbox in tor_open_cloexec whether or not O_CLOEXEC is defined. - Patch by "teor". Fixes bug 16515; bugfix on 0.2.3.1-alpha. diff --git a/changes/bug16543 b/changes/bug16543 deleted file mode 100644 index b252833..0000000 --- a/changes/bug16543 +++ /dev/null @@ -1,5 +0,0 @@ - o Removed features: - - Remove the HidServDirectoryV2 option. Now all relays offer to store - hidden service descriptors. Related to 16543. - - Remove the VoteOnHidServDirectoriesV2 option, since all authorities - have long set it to 1. Closes ticket 16543. diff --git a/changes/bug4862 b/changes/bug4862 deleted file mode 100644 index f92d79d..0000000 --- a/changes/bug4862 +++ /dev/null @@ -1,8 +0,0 @@ - o Major feature (Hidden Service): - - Remove the introduction point adaptative algorithm which is leaking - popularity by changing the amount of introduction points depending on - the amount of traffic the HS sees. With this, we stick to only 3 - introduction points. Closes ticket 4862. - - Add the torrc option HiddenServiceNumIntroductionPoints for an - operatory to specify a fix amount of introduction points. Maximum - value is 10 and default is 3. Closes ticket 4862. diff --git a/changes/faster-workqueue-test b/changes/faster-workqueue-test deleted file mode 100644 index 16489e4..0000000 --- a/changes/faster-workqueue-test +++ /dev/null @@ -1,3 +0,0 @@ - o Testing: - - The test_workqueue program now runs faster, and is enabled by - default as a part of "make check". diff --git a/changes/feature13642 b/changes/feature13642 deleted file mode 100644 index a1a9b25..0000000 --- a/changes/feature13642 +++ /dev/null @@ -1,5 +0,0 @@ - o Major features: - - Add support for offline encrypted ed25519 master keys. To use - this feature on your tor relay, run "tor --keygen" to make a new - master key (or to make a new signing key if you already have a - master key). Closes ticket 13642. diff --git a/changes/feature15220 b/changes/feature15220 deleted file mode 100644 index 6cab36d..0000000 --- a/changes/feature15220 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features (client, unix sockets): - - Add GroupWritable and WorldWritable options to unix-socket based - SocksPort and ControlPort options. These options apply to a single - socket, and override {Control,Socks}SocketsGroupWritable. Closes - ticket 15220. diff --git a/changes/feature15817-clang-sanitizers b/changes/feature15817-clang-sanitizers deleted file mode 100644 index 0010bd6..0000000 --- a/changes/feature15817-clang-sanitizers +++ /dev/null @@ -1,7 +0,0 @@ - o Minor enhancements (correctness, testing): - - Document use of coverity, clang static analyzer, and clang dynamic - undefined behavior and address sanitizers in doc/HACKING. - Add clang dynamic sanitizer blacklist in - contrib/clang/sanitizer_blacklist.txt to exempt known undefined - behavior. Include detailed usage instructions in the blacklist. - Patch by "teor". Closes ticket 15817. diff --git a/changes/feature16052 b/changes/feature16052 deleted file mode 100644 index cd09b58..0000000 --- a/changes/feature16052 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features (hidden service): - - Add the new options "HiddenServiceMaxStreams" and - "HiddenServiceMaxStreamsCloseCircuit" to allow hidden services to limit - the maximum number of simultaneous streams per circuit, and optionally - tear down the circuit when the limit is exceeded. Part of ticket 16052. diff --git a/changes/feature16467 b/changes/feature16467 deleted file mode 100644 index 5cd30fd..0000000 --- a/changes/feature16467 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor feature (performance): - - Improve the runtime speed of Ed25519 operations by using the - public-domain ed25519-donna by Andrew M. ("floodyberry"). Implements - ticket 16467. diff --git a/changes/feature9663 b/changes/feature9663 deleted file mode 100644 index c02e08d..0000000 --- a/changes/feature9663 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor feature (performance): - - Improve the runtime speed of the ntor handshake by using an - optimized curve25519 basepoint scalarmult implementation from the - public-domain ed25519-donna by Andrew M. ("floodyberry"), based on - ideas by Adam Langley. Implements ticket 9663. diff --git a/changes/ticket15358 b/changes/ticket15358 deleted file mode 100644 index 5b17586..0000000 --- a/changes/ticket15358 +++ /dev/null @@ -1,3 +0,0 @@ - o Features (control protocl): - - Support network-liveness GETINFO key and NETWORK_LIVENESS events in the - control protocol. Resolves ticket 15358. diff --git a/changes/ticket16034 b/changes/ticket16034 deleted file mode 100644 index a8546ef..0000000 --- a/changes/ticket16034 +++ /dev/null @@ -1,7 +0,0 @@ - o Removed features: - - - Tor no longer supports versions of OpenSSL before 1.0. (If you - are on an operating system that has not upgraded to OpenSSL 1.0 - or later, and you compile Tor from source, you will need to - install a more recent OpenSSL to link Tor against.) - Resolves ticket 16034. diff --git a/changes/ticket16140 b/changes/ticket16140 deleted file mode 100644 index 2798671..0000000 --- a/changes/ticket16140 +++ /dev/null @@ -1,7 +0,0 @@ - o Removed features: - - - Tor no longer supports copies of OpenSSL that are missing support for - Elliptic Curve Cryptography. In particular support for at least one of - P256 or P224 is now required, with manual configuration needed if only - P224 is available. - Resolves ticket 16140. diff --git a/changes/ticket16189 b/changes/ticket16189 deleted file mode 100644 index f07fad9..0000000 --- a/changes/ticket16189 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor Features (crypto, testing): - - Now that OpenSSL has its own scrypt implementation, add an unit - test that checks for interoperability between libscrypt_scrypt() - and OpenSSL's EVP_PBE_scrypt() so that we could not use libscrypt - and rely on EVP_PBE_scrypt() whenever possible. Resolves ticket - 16189. diff --git a/changes/variadic_macros b/changes/variadic_macros deleted file mode 100644 index 0d84dd9..0000000 --- a/changes/variadic_macros +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (portability): - - Use C99 variadic macros when the compiler is not GCC. This avoids - failing compilations on MSVC, and fixes a log-file-based race - condition in our old workarounds. Original patch from Gisle Vanem. diff --git a/changes/win-macros b/changes/win-macros deleted file mode 100644 index a46a474..0000000 --- a/changes/win-macros +++ /dev/null @@ -1,7 +0,0 @@ - o Code simplification and refactoring: - - Define WINVER and _WIN32_WINNT centrally, in orconfig.h, in order - to ensure they remain consistent and visible everywhere. - - - Remove some vestigial workarounds for the MSVC6 compiler. We haven't - supported that in ages. -

1 0

[tor/master] Change the name for the keypinning file; delete the old one if found
by nickm＠torproject.org 16 Jul '15

16 Jul '15

commit 8596ccce017c4ccb26d78235e383fa4289220338 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 14 11:33:35 2015 -0400 Change the name for the keypinning file; delete the old one if found This is a brute-force fix for #16580, wherein #16530 caused some routers to do bad things with the old keypinning journal. --- src/or/main.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/or/main.c b/src/or/main.c index af77f28..fe93cdc 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2034,7 +2034,7 @@ do_main_loop(void) /* Initialize the keypinning log. */ if (authdir_mode_v3(get_options())) { - char *fname = get_datadir_fname("key-pinning-entries"); + char *fname = get_datadir_fname("key-pinning-journal"); int r = 0; if (keypin_load_journal(fname)<0) { log_err(LD_DIR, "Error loading key-pinning journal: %s",strerror(errno)); @@ -2048,6 +2048,17 @@ do_main_loop(void) if (r) return r; } + { + /* This is the old name for key-pinning-journal. These got corrupted + * in a couple of cases by #16530, so we started over. See #16580 for + * the rationale and for other options we didn't take. We can remove + * this code once all the authorities that ran 0.2.7.1-alpha-dev are + * upgraded. + */ + char *fname = get_datadir_fname("key-pinning-entries"); + unlink(fname); + tor_free(fname); + } if (trusted_dirs_reload_certs()) { log_warn(LD_DIR,

1 0

[tor/master] Merge remote-tracking branch 'public/feature_16580'
by nickm＠torproject.org 16 Jul '15

16 Jul '15

commit 3d19eb71d2621ae749e5bfd6134b0d2c2250f58f Merge: 6a08bcf 8596ccc Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 16 15:48:41 2015 -0400 Merge remote-tracking branch 'public/feature_16580' src/or/main.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)

1 0

[tor/master] Remove the HidServDirV2 and VoteOnHidServDirectoriesV2 options
by nickm＠torproject.org 16 Jul '15

16 Jul '15

commit 2f8cf524ba4e565ab613504a4c41fd724d32facc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 10 09:03:56 2015 -0400 Remove the HidServDirV2 and VoteOnHidServDirectoriesV2 options (Mark them as obsolete) Closes 16543. --- changes/bug16543 | 5 +++++ src/or/config.c | 4 ++-- src/or/directory.c | 6 ++---- src/or/dirserv.c | 18 ++++++------------ src/or/dirvote.h | 3 +-- src/or/networkstatus.c | 2 +- src/or/or.h | 3 --- src/or/router.c | 2 +- src/or/routerlist.c | 5 ----- 9 files changed, 18 insertions(+), 30 deletions(-) diff --git a/changes/bug16543 b/changes/bug16543 new file mode 100644 index 0000000..6f77eaa --- /dev/null +++ b/changes/bug16543 @@ -0,0 +1,5 @@ + - Removed features: + - Remove the HidServDirectoryV2 option. Now all relays offer to store + hidden service descriptors. Related to 16543. + - Remove the VoteOnHidServDirectoriesV2 option, since all authorities + have long set it to 1. Closes ticket 16543. diff --git a/src/or/config.c b/src/or/config.c index 0d6c300..731dd93 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -278,7 +278,7 @@ static config_var_t option_vars_[] = { V(AccelName, STRING, NULL), V(AccelDir, FILENAME, NULL), V(HashedControlPassword, LINELIST, NULL), - V(HidServDirectoryV2, BOOL, "1"), + OBSOLETE("HidServDirectoryV2"), VAR("HiddenServiceDir", LINELIST_S, RendConfigLines, NULL), VAR("HiddenServiceDirGroupReadable", LINELIST_S, RendConfigLines, NULL), VAR("HiddenServiceOptions",LINELIST_V, RendConfigLines, NULL), @@ -448,6 +448,7 @@ static config_var_t option_vars_[] = { V(V3BandwidthsFile, FILENAME, NULL), V(GuardfractionFile, FILENAME, NULL), VAR("VersioningAuthoritativeDirectory",BOOL,VersioningAuthoritativeDir, "0"), + OBSOLETE("VoteOnHidServDirectoriesV2"), V(VirtualAddrNetworkIPv4, STRING, "127.192.0.0/10"), V(VirtualAddrNetworkIPv6, STRING, "[FE80::]/10"), V(WarnPlaintextPorts, CSV, "23,109,110,143"), @@ -460,7 +461,6 @@ static config_var_t option_vars_[] = { NULL), VAR("__OwningControllerProcess",STRING,OwningControllerProcess, NULL), V(MinUptimeHidServDirectoryV2, INTERVAL, "96 hours"), - V(VoteOnHidServDirectoriesV2, BOOL, "1"), V(TestingServerDownloadSchedule, CSV_INTERVAL, "0, 0, 0, 60, 60, 120, " "300, 900, 2147483647"), V(TestingClientDownloadSchedule, CSV_INTERVAL, "0, 0, 60, 300, 600, " diff --git a/src/or/directory.c b/src/or/directory.c index 8d7f9f4..9461606 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3095,8 +3095,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, goto done; } - if (options->HidServDirectoryV2 && - connection_dir_is_encrypted(conn) && + if (connection_dir_is_encrypted(conn) && !strcmpstart(url,"/tor/rendezvous2/")) { /* Handle v2 rendezvous descriptor fetch request. */ const char *descp; @@ -3240,8 +3239,7 @@ directory_handle_command_post(dir_connection_t *conn, const char *headers, log_debug(LD_DIRSERV,"rewritten url as '%s'.", escaped(url)); /* Handle v2 rendezvous service publish request. */ - if (options->HidServDirectoryV2 && - connection_dir_is_encrypted(conn) && + if (connection_dir_is_encrypted(conn) && !strcmpstart(url,"/tor/rendezvous2/publish")) { switch (rend_cache_store_v2_desc_as_dir(body)) { case RCS_NOTDIR: diff --git a/src/or/dirserv.c b/src/or/dirserv.c index ed38ba2..4de197f 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2129,8 +2129,7 @@ set_routerstatus_from_routerinfo(routerstatus_t *rs, node_t *node, routerinfo_t *ri, time_t now, - int listbadexits, - int vote_on_hsdirs) + int listbadexits) { const or_options_t *options = get_options(); uint32_t routerbw_kb = dirserv_get_credible_bandwidth_kb(ri); @@ -2167,8 +2166,8 @@ set_routerstatus_from_routerinfo(routerstatus_t *rs, } rs->is_bad_exit = listbadexits && node->is_bad_exit; - node->is_hs_dir = dirserv_thinks_router_is_hs_dir(ri, node, now); - rs->is_hs_dir = vote_on_hsdirs && node->is_hs_dir; + rs->is_hs_dir = node->is_hs_dir = + dirserv_thinks_router_is_hs_dir(ri, node, now); rs->is_named = rs->is_unnamed = 0; @@ -2206,8 +2205,7 @@ set_routerstatus_from_routerinfo(routerstatus_t *rs, if (routerset_contains_routerstatus(options->TestingDirAuthVoteHSDir, rs, 0)) { - /* TestingDirAuthVoteHSDir respects VoteOnHidServDirectoriesV2 */ - rs->is_hs_dir = vote_on_hsdirs; + rs->is_hs_dir = 1; } } } @@ -2733,7 +2731,6 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, char identity_digest[DIGEST_LEN]; char signing_key_digest[DIGEST_LEN]; int listbadexits = options->AuthDirListBadExits; - int vote_on_hsdirs = options->VoteOnHidServDirectoriesV2; routerlist_t *rl = router_get_routerlist(); time_t now = time(NULL); time_t cutoff = now - ROUTER_MAX_AGE_TO_PUBLISH; @@ -2824,8 +2821,7 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, vrs = tor_malloc_zero(sizeof(vote_routerstatus_t)); rs = &vrs->status; set_routerstatus_from_routerinfo(rs, node, ri, now, - listbadexits, - vote_on_hsdirs); + listbadexits); if (ri->signing_key_cert) { memcpy(vrs->ed25519_id, ri->signing_key_cert->signing_key.pubkey, @@ -2922,14 +2918,12 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, v3_out->known_flags = smartlist_new(); smartlist_split_string(v3_out->known_flags, - "Authority Exit Fast Guard Stable V2Dir Valid", + "Authority Exit Fast Guard Stable V2Dir Valid HSDir", 0, SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); if (vote_on_reachability) smartlist_add(v3_out->known_flags, tor_strdup("Running")); if (listbadexits) smartlist_add(v3_out->known_flags, tor_strdup("BadExit")); - if (vote_on_hsdirs) - smartlist_add(v3_out->known_flags, tor_strdup("HSDir")); smartlist_sort_strings(v3_out->known_flags); if (options->ConsensusParams) { diff --git a/src/or/dirvote.h b/src/or/dirvote.h index 0fb2b25..dca8540 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -145,8 +145,7 @@ const cached_dir_t *dirvote_get_vote(const char *fp, int flags); void set_routerstatus_from_routerinfo(routerstatus_t *rs, node_t *node, routerinfo_t *ri, time_t now, - int listbadexits, - int vote_on_hsdirs); + int listbadexits); networkstatus_t * dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, authority_cert_t *cert); diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 9de1f88..71a2c0f 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1678,7 +1678,7 @@ networkstatus_getinfo_by_purpose(const char *purpose_string, time_t now) if (bridge_auth && ri->purpose == ROUTER_PURPOSE_BRIDGE) dirserv_set_router_is_running(ri, now); /* then generate and write out status lines for each of them */ - set_routerstatus_from_routerinfo(&rs, node, ri, now, 0, 0); + set_routerstatus_from_routerinfo(&rs, node, ri, now, 0); smartlist_add(statuses, networkstatus_getinfo_helper_single(&rs)); } SMARTLIST_FOREACH_END(ri); diff --git a/src/or/or.h b/src/or/or.h index 946e7e0..d35c47f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3590,10 +3590,7 @@ typedef struct { int PublishHidServDescriptors; int FetchServerDescriptors; /**< Do we fetch server descriptors as normal? */ int FetchHidServDescriptors; /**< and hidden service descriptors? */ - int HidServDirectoryV2; /**< Do we participate in the HS DHT? */ - int VoteOnHidServDirectoriesV2; /**< As a directory authority, vote on - * assignment of the HSDir flag? */ int MinUptimeHidServDirectoryV2; /**< As directory authority, accept hidden * service directories after what time? */ diff --git a/src/or/router.c b/src/or/router.c index 0903eb2..47825e2 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2583,7 +2583,7 @@ router_dump_router_to_string(routerinfo_t *router, ntor_cc_line ? ntor_cc_line : "", family_line, we_are_hibernating() ? "hibernating 1\n" : "", - options->HidServDirectoryV2 ? "hidden-service-dir\n" : "", + "hidden-service-dir\n", options->AllowSingleHopExits ? "allow-single-hop-exits\n" : ""); if (options->ContactInfo && strlen(options->ContactInfo)) { diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 3502196..dc48862 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5179,11 +5179,6 @@ hid_serv_acting_as_directory(void) const routerinfo_t *me = router_get_my_routerinfo(); if (!me) return 0; - if (!get_options()->HidServDirectoryV2) { - log_info(LD_REND, "We are not acting as hidden service directory, " - "because we have not been configured as such."); - return 0; - } return 1; }

1 0

[tor/master] Merge remote-tracking branch 'public/ticket16543'
by nickm＠torproject.org 16 Jul '15

16 Jul '15

commit 6a08bcf530f5991ae0e2600ef01be377857b5942 Merge: 2ba6542 2f8cf52 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 16 15:47:00 2015 -0400 Merge remote-tracking branch 'public/ticket16543' changes/bug16543 | 5 +++++ src/or/config.c | 4 ++-- src/or/directory.c | 6 ++---- src/or/dirserv.c | 18 ++++++------------ src/or/dirvote.h | 3 +-- src/or/networkstatus.c | 2 +- src/or/or.h | 3 --- src/or/router.c | 2 +- src/or/routerlist.c | 5 ----- 9 files changed, 18 insertions(+), 30 deletions(-)

1 0