- tor-commits - lists.torproject.org

[metrics-web/master] Use less political country names.
by karsten＠torproject.org 05 Jan '12

05 Jan '12

commit bcdf0cabeb0b92369639faddeffae487719a9162 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jan 5 19:36:19 2012 +0100 Use less political country names. So far we used Maxmind's country names. Now we're using the names found in Wikipedia's country pages. Implements #4809. --- rserve/graphs.R | 24 ++++++++++++------------ src/org/torproject/ernie/web/Countries.java | 27 ++++++++++++--------------- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index 886fabf..2900c02 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -27,7 +27,7 @@ countrylist <- list( "bj" = "Benin", "bl" = "Saint Bartelemey", "bm" = "Bermuda", - "bn" = "Brunei Darussalam", + "bn" = "Brunei", "bo" = "Bolivia", "br" = "Brazil", "bs" = "the Bahamas", @@ -42,7 +42,7 @@ countrylist <- list( "cf" = "Central African Republic", "cg" = "Congo", "ch" = "Switzerland", - "ci" = "Cote d'Ivoire", + "ci" = "Côte d'Ivoire", "ck" = "the Cook Islands", "cl" = "Chile", "cm" = "Cameroon", @@ -106,7 +106,7 @@ countrylist <- list( "in" = "India", "io" = "the British Indian Ocean Territory", "iq" = "Iraq", - "ir" = "the Islamic Republic of Iran", + "ir" = "Iran", "is" = "Iceland", "it" = "Italy", "je" = "Jersey", @@ -119,12 +119,12 @@ countrylist <- list( "ki" = "Kiribati", "km" = "Comoros", "kn" = "Saint Kitts and Nevis", - "kp" = "the Democratic People's Republic of Korea", + "kp" = "North Korea", "kr" = "the Republic of Korea", "kw" = "Kuwait", "ky" = "the Cayman Islands", "kz" = "Kazakhstan", - "la" = "Lao People's Democratic Republic", + "la" = "Laos", "lb" = "Lebanon", "lc" = "Saint Lucia", "li" = "Liechtenstein", @@ -144,9 +144,9 @@ countrylist <- list( "mh" = "the Marshall Islands", "mk" = "Macedonia", "ml" = "Mali", - "mm" = "Myanmar", + "mm" = "Burma", "mn" = "Mongolia", - "mo" = "Macao", + "mo" = "Macau", "mp" = "the Northern Mariana Islands", "mq" = "Martinique", "mr" = "Mauritania", @@ -179,7 +179,7 @@ countrylist <- list( "pk" = "Pakistan", "pl" = "Poland", "pm" = "Saint Pierre and Miquelon", - "pn" = "Pitcairn", + "pn" = "the Pitcairn Islands", "pr" = "Puerto Rico", "ps" = "the Palestinian Territory", "pt" = "Portugal", @@ -189,7 +189,7 @@ countrylist <- list( "re" = "Reunion", "ro" = "Romania", "rs" = "Serbia", - "ru" = "the Russian Federation", + "ru" = "Russia", "rw" = "Rwanda", "sa" = "Saudi Arabia", "sb" = "the Solomon Islands", @@ -206,7 +206,7 @@ countrylist <- list( "sn" = "Senegal", "so" = "Somalia", "sr" = "Suriname", - "st" = "Sao Tome and Principe", + "st" = "São Tomé and Príncipe", "sv" = "El Salvador", "sy" = "the Syrian Arab Republic", "sz" = "Swaziland", @@ -217,7 +217,7 @@ countrylist <- list( "th" = "Thailand", "tj" = "Tajikistan", "tk" = "Tokelau", - "tl" = "Timor-Leste", + "tl" = "East Timor", "tm" = "Turkmenistan", "tn" = "Tunisia", "to" = "Tonga", @@ -232,7 +232,7 @@ countrylist <- list( "us" = "the United States", "uy" = "Uruguay", "uz" = "Uzbekistan", - "va" = "Vatican City State", + "va" = "Vatican City", "vc" = "Saint Vincent and the Grenadines", "ve" = "Venezuela", "vg" = "the British Virgin Islands", diff --git a/src/org/torproject/ernie/web/Countries.java b/src/org/torproject/ernie/web/Countries.java index 7149cfb..4411834 100644 --- a/src/org/torproject/ernie/web/Countries.java +++ b/src/org/torproject/ernie/web/Countries.java @@ -49,7 +49,7 @@ public class Countries { this.knownCountries.add("br;Brazil".split(";")); this.knownCountries.add("io;British Indian Ocean Territory". split(";")); - this.knownCountries.add("bn;Brunei Darussalam".split(";")); + this.knownCountries.add("bn;Brunei".split(";")); this.knownCountries.add("bg;Bulgaria".split(";")); this.knownCountries.add("bf;Burkina Faso".split(";")); this.knownCountries.add("mm;Burma".split(";")); @@ -72,7 +72,7 @@ public class Countries { this.knownCountries.add("cg;Congo".split(";")); this.knownCountries.add("ck;Cook Islands".split(";")); this.knownCountries.add("cr;Costa Rica".split(";")); - this.knownCountries.add("ci;Cote d'Ivoire".split(";")); + this.knownCountries.add("ci;Côte d'Ivoire".split(";")); this.knownCountries.add("hr;Croatia".split(";")); this.knownCountries.add("cu;Cuba".split(";")); this.knownCountries.add("cy;Cyprus".split(";")); @@ -116,15 +116,14 @@ public class Countries { this.knownCountries.add("ht;Haiti".split(";")); this.knownCountries.add("hm;Heard Island and McDonald Islands". split(";")); - this.knownCountries.add("va;Holy See (Vatican City State)". - split(";")); + this.knownCountries.add("va;Vatican City".split(";")); this.knownCountries.add("hn;Honduras".split(";")); this.knownCountries.add("hk;Hong Kong".split(";")); this.knownCountries.add("hu;Hungary".split(";")); this.knownCountries.add("is;Iceland".split(";")); this.knownCountries.add("in;India".split(";")); this.knownCountries.add("id;Indonesia".split(";")); - this.knownCountries.add("ir;Iran, Islamic Republic of".split(";")); + this.knownCountries.add("ir;Iran".split(";")); this.knownCountries.add("iq;Iraq".split(";")); this.knownCountries.add("ie;Ireland".split(";")); this.knownCountries.add("im;Isle of Man".split(";")); @@ -137,13 +136,11 @@ public class Countries { this.knownCountries.add("kz;Kazakhstan".split(";")); this.knownCountries.add("ke;Kenya".split(";")); this.knownCountries.add("ki;Kiribati".split(";")); - this.knownCountries.add("kp;Korea, Democratic People's Republic of". - split(";")); + this.knownCountries.add("kp;North Korea".split(";")); this.knownCountries.add("kr;Korea, Republic of".split(";")); this.knownCountries.add("kw;Kuwait".split(";")); this.knownCountries.add("kg;Kyrgyzstan".split(";")); - this.knownCountries.add("la;Lao People's Democratic Republic". - split(";")); + this.knownCountries.add("la;Laos".split(";")); this.knownCountries.add("lv;Latvia".split(";")); this.knownCountries.add("lb;Lebanon".split(";")); this.knownCountries.add("ls;Lesotho".split(";")); @@ -152,7 +149,7 @@ public class Countries { this.knownCountries.add("li;Liechtenstein".split(";")); this.knownCountries.add("lt;Lithuania".split(";")); this.knownCountries.add("lu;Luxembourg".split(";")); - this.knownCountries.add("mo;Macao".split(";")); + this.knownCountries.add("mo;Macau".split(";")); this.knownCountries.add("mk;Macedonia".split(";")); this.knownCountries.add("mg;Madagascar".split(";")); this.knownCountries.add("mw;Malawi".split(";")); @@ -175,7 +172,7 @@ public class Countries { this.knownCountries.add("ms;Montserrat".split(";")); this.knownCountries.add("ma;Morocco".split(";")); this.knownCountries.add("mz;Mozambique".split(";")); - this.knownCountries.add("mm;Myanmar".split(";")); + this.knownCountries.add("mm;Burma".split(";")); this.knownCountries.add("na;Namibia".split(";")); this.knownCountries.add("nr;Nauru".split(";")); this.knownCountries.add("np;Nepal".split(";")); @@ -199,14 +196,14 @@ public class Countries { this.knownCountries.add("py;Paraguay".split(";")); this.knownCountries.add("pe;Peru".split(";")); this.knownCountries.add("ph;Philippines".split(";")); - this.knownCountries.add("pn;Pitcairn".split(";")); + this.knownCountries.add("pn;Pitcairn Islands".split(";")); this.knownCountries.add("pl;Poland".split(";")); this.knownCountries.add("pt;Portugal".split(";")); this.knownCountries.add("pr;Puerto Rico".split(";")); this.knownCountries.add("qa;Qatar".split(";")); this.knownCountries.add("re;Reunion".split(";")); this.knownCountries.add("ro;Romania".split(";")); - this.knownCountries.add("ru;Russian Federation".split(";")); + this.knownCountries.add("ru;Russia".split(";")); this.knownCountries.add("rw;Rwanda".split(";")); this.knownCountries.add("bl;Saint Bartelemey".split(";")); this.knownCountries.add("sh;Saint Helena".split(";")); @@ -218,7 +215,7 @@ public class Countries { split(";")); this.knownCountries.add("ws;Samoa".split(";")); this.knownCountries.add("sm;San Marino".split(";")); - this.knownCountries.add("st;Sao Tome and Principe".split(";")); + this.knownCountries.add("st;São Tomé and Príncipe".split(";")); this.knownCountries.add("sa;Saudi Arabia".split(";")); this.knownCountries.add("sn;Senegal".split(";")); this.knownCountries.add("rs;Serbia".split(";")); @@ -245,7 +242,7 @@ public class Countries { this.knownCountries.add("tj;Tajikistan".split(";")); this.knownCountries.add("tz;Tanzania, United Republic of".split(";")); this.knownCountries.add("th;Thailand".split(";")); - this.knownCountries.add("tl;Timor-Leste".split(";")); + this.knownCountries.add("tl;East Timor".split(";")); this.knownCountries.add("tg;Togo".split(";")); this.knownCountries.add("tk;Tokelau".split(";")); this.knownCountries.add("to;Tonga".split(";"));

1 0

[vidalia/alpha] Get the current progress at connect without waiting for events
by chiiph＠torproject.org 05 Jan '12

05 Jan '12

commit 0786bf230ffc3db19a8087dd04b70e12e9db713d Author: Tomás Touceda <chiiph(a)torproject.org> Date: Thu Jan 5 11:08:57 2012 -0300 Get the current progress at connect without waiting for events --- src/torcontrol/TorControl.cpp | 29 +++++++++++++++++++++++++++++ src/torcontrol/TorControl.h | 1 + 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/src/torcontrol/TorControl.cpp b/src/torcontrol/TorControl.cpp index 433e1a9..5d31023 100644 --- a/src/torcontrol/TorControl.cpp +++ b/src/torcontrol/TorControl.cpp @@ -213,6 +213,33 @@ TorControl::disconnect() _controlConn->disconnect(); } +void +TorControl::getBootstrapPhase() +{ + ControlCommand cmd("GETINFO", "status/bootstrap-phase"); + ControlReply reply; + QString str; + + if (!send(cmd, reply, &str)) { + return; + } + + bool ok; + QHash<QString, QString> args; + args = string_parse_keyvals(reply.getMessage(), &ok); + + if(!ok) + return; + + tc::Severity severity = tc::severityFromString(args.value("status/bootstrap-phase")); + BootstrapStatus status + = BootstrapStatus(severity, + BootstrapStatus::statusFromString(args.value("TAG")), + args.value("PROGRESS").toInt(), + args.value("SUMMARY")); + emit bootstrapStatusChanged(status); +} + /** Emits a signal that the control socket disconnected from Tor */ void TorControl::onDisconnected() @@ -313,6 +340,8 @@ TorControl::onAuthenticated() /* We want to use extended events in all async events */ useFeature("EXTENDED_EVENTS"); + getBootstrapPhase(); + emit authenticated(); } diff --git a/src/torcontrol/TorControl.h b/src/torcontrol/TorControl.h index 589fa23..f3504f5 100644 --- a/src/torcontrol/TorControl.h +++ b/src/torcontrol/TorControl.h @@ -401,6 +401,7 @@ private: /* The slots below simply relay signals from the appropriate member objects */ private slots: void onStopped(int exitCode, QProcess::ExitStatus exitStatus); + void getBootstrapPhase(); void onDisconnected(); void onLogStdout(const QString &severity, const QString &message); void onAuthenticated();

1 0

[vidalia/alpha] Add changes file
by chiiph＠torproject.org 05 Jan '12

05 Jan '12

commit d5aeb20f49c5d340d50a3cf11a4d44a38c700bd5 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Thu Jan 5 11:14:28 2012 -0300 Add changes file --- changes/bug4827 | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/bug4827 b/changes/bug4827 new file mode 100644 index 0000000..799a3dc --- /dev/null +++ b/changes/bug4827 @@ -0,0 +1,6 @@ + o When Tor has cached enough information it bootstraps faster than + what takes Vidalia connect to it, so Vidalia does not see the + event to update the progress bar. Now Vidalia explicitly asks for + bootstrap-phase when it connects to Tor, and updates the progress + to what is actually happening instead of hanging in + "Authenticating to Tor". Fixes bug 4827. \ No newline at end of file

1 0

[vidalia/master] Get the current progress at connect without waiting for events
by chiiph＠torproject.org 05 Jan '12

05 Jan '12

commit 172c2f640f50f07d6f20ad5e3410c4fdb249ee2e Author: Tomás Touceda <chiiph(a)torproject.org> Date: Thu Jan 5 11:08:57 2012 -0300 Get the current progress at connect without waiting for events --- src/torcontrol/TorControl.cpp | 29 +++++++++++++++++++++++++++++ src/torcontrol/TorControl.h | 1 + 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/src/torcontrol/TorControl.cpp b/src/torcontrol/TorControl.cpp index 57abeb1..af925a7 100644 --- a/src/torcontrol/TorControl.cpp +++ b/src/torcontrol/TorControl.cpp @@ -209,6 +209,33 @@ TorControl::disconnect() _controlConn->disconnect(); } +void +TorControl::getBootstrapPhase() +{ + ControlCommand cmd("GETINFO", "status/bootstrap-phase"); + ControlReply reply; + QString str; + + if (!send(cmd, reply, &str)) { + return; + } + + bool ok; + QHash<QString, QString> args; + args = string_parse_keyvals(reply.getMessage(), &ok); + + if(!ok) + return; + + tc::Severity severity = tc::severityFromString(args.value("status/bootstrap-phase")); + BootstrapStatus status + = BootstrapStatus(severity, + BootstrapStatus::statusFromString(args.value("TAG")), + args.value("PROGRESS").toInt(), + args.value("SUMMARY")); + emit bootstrapStatusChanged(status); +} + /** Emits a signal that the control socket disconnected from Tor */ void TorControl::onDisconnected() @@ -309,6 +336,8 @@ TorControl::onAuthenticated() /* We want to use extended events in all async events */ useFeature("EXTENDED_EVENTS"); + getBootstrapPhase(); + emit authenticated(); } diff --git a/src/torcontrol/TorControl.h b/src/torcontrol/TorControl.h index 589fa23..f3504f5 100644 --- a/src/torcontrol/TorControl.h +++ b/src/torcontrol/TorControl.h @@ -401,6 +401,7 @@ private: /* The slots below simply relay signals from the appropriate member objects */ private slots: void onStopped(int exitCode, QProcess::ExitStatus exitStatus); + void getBootstrapPhase(); void onDisconnected(); void onLogStdout(const QString &severity, const QString &message); void onAuthenticated();

1 0

[vidalia/master] Add changes file
by chiiph＠torproject.org 05 Jan '12

05 Jan '12

commit ad697c4f99df426929f37ea475f645871c6421ee Author: Tomás Touceda <chiiph(a)torproject.org> Date: Thu Jan 5 11:14:28 2012 -0300 Add changes file --- changes/bug4827 | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/bug4827 b/changes/bug4827 new file mode 100644 index 0000000..799a3dc --- /dev/null +++ b/changes/bug4827 @@ -0,0 +1,6 @@ + o When Tor has cached enough information it bootstraps faster than + what takes Vidalia connect to it, so Vidalia does not see the + event to update the progress bar. Now Vidalia explicitly asks for + bootstrap-phase when it connects to Tor, and updates the progress + to what is actually happening instead of hanging in + "Authenticating to Tor". Fixes bug 4827. \ No newline at end of file

1 0

[metrics-web/master] Restrict relay search to last four days first.
by karsten＠torproject.org 05 Jan '12

05 Jan '12

commit 444f874cf19fb10fc4364e037a2af09073e60f12 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jan 5 07:01:31 2012 +0100 Restrict relay search to last four days first. The idea is that most searches will find 31 matches in the last four days, a time that covers 96 consensuses. Only if the search returns less than 31 matches, we'll have to re-run the search for the last month. --- .../torproject/ernie/web/RelaySearchServlet.java | 144 +++++++++++--------- 1 files changed, 82 insertions(+), 62 deletions(-) diff --git a/src/org/torproject/ernie/web/RelaySearchServlet.java b/src/org/torproject/ernie/web/RelaySearchServlet.java index 05be5e8..82d223b 100644 --- a/src/org/torproject/ernie/web/RelaySearchServlet.java +++ b/src/org/torproject/ernie/web/RelaySearchServlet.java @@ -297,17 +297,15 @@ public class RelaySearchServlet extends HttpServlet { + "address LIKE '" + searchIPAddress + "%' "); addAnd = true; } - StringBuilder queryBuilder = new StringBuilder(); - queryBuilder.append("SELECT validafter, fingerprint, descriptor, " - + "rawdesc FROM statusentry WHERE validafter IN (SELECT " - + "validafter FROM statusentry WHERE "); - queryBuilder.append(conditionBuilder.toString()); + List<String> timeIntervals = new ArrayList<String>(); if (searchDayTimestamps.size() > 0 || searchMonthTimestamps.size() > 0) { + StringBuilder timeIntervalBuilder = new StringBuilder(); boolean addOr = false; - queryBuilder.append("AND ("); + timeIntervalBuilder.append("AND ("); for (long searchTimestamp : searchDayTimestamps) { - queryBuilder.append((addOr ? "OR " : "") + "(validafter >= '" + timeIntervalBuilder.append((addOr ? "OR " : "") + + "(validafter >= '" + dateTimeFormat.format(searchTimestamp) + "' AND " + "validafter < '" + dateTimeFormat.format(searchTimestamp + 24L * 60L * 60L * 1000L) + "') "); @@ -318,22 +316,35 @@ public class RelaySearchServlet extends HttpServlet { TimeZone.getTimeZone("UTC")); firstOfNextMonth.setTimeInMillis(searchTimestamp); firstOfNextMonth.add(Calendar.MONTH, 1); - queryBuilder.append((addOr ? "OR " : "") + "(validafter >= '" + timeIntervalBuilder.append((addOr ? "OR " : "") + + "(validafter >= '" + dateTimeFormat.format(searchTimestamp) + "' AND " + "validafter < '" + dateTimeFormat.format( firstOfNextMonth.getTimeInMillis()) + "') "); addOr = true; } - queryBuilder.append(") "); + timeIntervalBuilder.append(") "); + timeIntervals.add(timeIntervalBuilder.toString()); } else { - queryBuilder.append("AND validafter >= '" + dateTimeFormat.format( - System.currentTimeMillis() - 30L * 24L * 60L * 60L * 1000L) - + "' "); + timeIntervals.add("AND validafter >= '" + + dateTimeFormat.format(System.currentTimeMillis() + - 4L * 24L * 60L * 60L * 1000L) + "' "); + timeIntervals.add("AND validafter >= '" + + dateTimeFormat.format(System.currentTimeMillis() + - 30L * 24L * 60L * 60L * 1000L) + "' "); + } + List<String> queries = new ArrayList<String>(); + for (String timeInterval : timeIntervals) { + StringBuilder queryBuilder = new StringBuilder(); + queryBuilder.append("SELECT validafter, fingerprint, descriptor, " + + "rawdesc FROM statusentry WHERE validafter IN (SELECT " + + "validafter FROM statusentry WHERE "); + queryBuilder.append(conditionBuilder.toString()); + queryBuilder.append(timeInterval); + queryBuilder.append("ORDER BY validafter DESC LIMIT 31) AND "); + queryBuilder.append(conditionBuilder.toString()); + queries.add(queryBuilder.toString()); } - queryBuilder.append("ORDER BY validafter DESC LIMIT 31) AND "); - queryBuilder.append(conditionBuilder.toString()); - String query = queryBuilder.toString(); - request.setAttribute("query", query); /* Actually execute the query. */ long startedQuery = System.currentTimeMillis(); @@ -343,59 +354,67 @@ public class RelaySearchServlet extends HttpServlet { Map<String, String> rawValidAfterLines = new HashMap<String, String>(); Map<String, String> rawStatusEntries = new HashMap<String, String>(); + String query = null; int matches = 0; try { long requestedConnection = System.currentTimeMillis(); Connection conn = this.ds.getConnection(); - Statement statement = conn.createStatement(); - ResultSet rs = statement.executeQuery(query); - while (rs.next()) { - matches++; - String validAfter = rs.getTimestamp(1).toString(). - substring(0, 19); - String fingerprint = rs.getString(2); - String descriptor = rs.getString(3); - if (!foundDescriptors.containsKey(validAfter)) { - foundDescriptors.put(validAfter, new TreeSet<String>()); - } - foundDescriptors.get(validAfter).add(validAfter + " " - + fingerprint); - if (!rawValidAfterLines.containsKey(validAfter)) { - rawValidAfterLines.put(validAfter, "<tt>valid-after " - + "<a href=\"consensus?valid-after=" - + validAfter.replaceAll(":", "-").replaceAll(" ", "-") - + "\" target=\"_blank\">" + validAfter + "</a></tt> "); - } - byte[] rawStatusEntry = rs.getBytes(4); - String statusEntryLines = null; - try { - statusEntryLines = new String(rawStatusEntry, "US-ASCII"); - } catch (UnsupportedEncodingException e) { - /* This shouldn't happen, because we know that ASCII is - * supported. */ - } - StringBuilder rawStatusEntryBuilder = new StringBuilder(); - String[] lines = statusEntryLines.split("\n"); - for (String line : lines) { - if (line.startsWith("r ")) { - String[] parts = line.split(" "); - String descriptorBase64 = String.format("%040x", - new BigInteger(1, Base64.decodeBase64(parts[3] - + "=="))); - rawStatusEntryBuilder.append("<tt>r " + parts[1] + " " - + parts[2] + " <a href=\"descriptor.html?desc-id=" - + descriptorBase64 + "\" target=\"_blank\">" + parts[3] - + "</a> " + parts[4] + " " + parts[5] + " " + parts[6] - + " " + parts[7] + " " + parts[8] + "</tt> "); - } else { - rawStatusEntryBuilder.append("<tt>" + line + "</tt> "); + while (!queries.isEmpty()) { + query = queries.remove(0); + this.logger.info("Running query '" + query + "'."); + Statement statement = conn.createStatement(); + ResultSet rs = statement.executeQuery(query); + while (rs.next()) { + matches++; + String validAfter = rs.getTimestamp(1).toString(). + substring(0, 19); + String fingerprint = rs.getString(2); + String descriptor = rs.getString(3); + if (!foundDescriptors.containsKey(validAfter)) { + foundDescriptors.put(validAfter, new TreeSet<String>()); + } + foundDescriptors.get(validAfter).add(validAfter + " " + + fingerprint); + if (!rawValidAfterLines.containsKey(validAfter)) { + rawValidAfterLines.put(validAfter, "<tt>valid-after " + + "<a href=\"consensus?valid-after=" + + validAfter.replaceAll(":", "-").replaceAll(" ", "-") + + "\" target=\"_blank\">" + validAfter + "</a></tt> "); } + byte[] rawStatusEntry = rs.getBytes(4); + String statusEntryLines = null; + try { + statusEntryLines = new String(rawStatusEntry, "US-ASCII"); + } catch (UnsupportedEncodingException e) { + /* This shouldn't happen, because we know that ASCII is + * supported. */ + } + StringBuilder rawStatusEntryBuilder = new StringBuilder(); + String[] lines = statusEntryLines.split("\n"); + for (String line : lines) { + if (line.startsWith("r ")) { + String[] parts = line.split(" "); + String descriptorBase64 = String.format("%040x", + new BigInteger(1, Base64.decodeBase64(parts[3] + + "=="))); + rawStatusEntryBuilder.append("<tt>r " + parts[1] + " " + + parts[2] + " <a href=\"descriptor.html?desc-id=" + + descriptorBase64 + "\" target=\"_blank\">" + parts[3] + + "</a> " + parts[4] + " " + parts[5] + " " + parts[6] + + " " + parts[7] + " " + parts[8] + "</tt> "); + } else { + rawStatusEntryBuilder.append("<tt>" + line + "</tt> "); + } + } + rawStatusEntries.put(validAfter + " " + fingerprint, + rawStatusEntryBuilder.toString()); + } + rs.close(); + statement.close(); + if (matches == 31) { + queries.clear(); } - rawStatusEntries.put(validAfter + " " + fingerprint, - rawStatusEntryBuilder.toString()); } - rs.close(); - statement.close(); conn.close(); this.logger.info("Returned a database connection to the pool " + "after " + (System.currentTimeMillis() @@ -407,6 +426,7 @@ public class RelaySearchServlet extends HttpServlet { "Database problem"); return; } + request.setAttribute("query", query); request.setAttribute("queryTime", System.currentTimeMillis() - startedQuery); request.setAttribute("foundDescriptors", foundDescriptors);

1 0

[torbrowser/maint-2.2] update recommended-versions for 2.2.35-4
by erinn＠torproject.org 05 Jan '12

05 Jan '12

commit 860d4e72ef182cc42f9d94e44945b72593a9c881 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Jan 5 18:34:37 2012 +0100 update recommended-versions for 2.2.35-4 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 293d0b4..f1e681b 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.35-3-Linux-i686", -"2.2.35-3-Linux-x86_64", -"2.2.35-3-MacOS-i386", -"2.2.35-3-MacOS-x86_64", -"2.2.35-3-Windows" +"2.2.35-4-Linux-i686", +"2.2.35-4-Linux-x86_64", +"2.2.35-4-MacOS-i386", +"2.2.35-4-MacOS-x86_64", +"2.2.35-4-Windows" ]

1 0

[torbrowser/maint-2.3] update recommended-versions for 2.2.35-4
by erinn＠torproject.org 05 Jan '12

05 Jan '12

commit 860d4e72ef182cc42f9d94e44945b72593a9c881 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Jan 5 18:34:37 2012 +0100 update recommended-versions for 2.2.35-4 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 293d0b4..f1e681b 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.35-3-Linux-i686", -"2.2.35-3-Linux-x86_64", -"2.2.35-3-MacOS-i386", -"2.2.35-3-MacOS-x86_64", -"2.2.35-3-Windows" +"2.2.35-4-Linux-i686", +"2.2.35-4-Linux-x86_64", +"2.2.35-4-MacOS-i386", +"2.2.35-4-MacOS-x86_64", +"2.2.35-4-Windows" ]

1 0

[torbrowser/master] update recommended-versions for 2.2.35-4
by erinn＠torproject.org 05 Jan '12

05 Jan '12

commit 860d4e72ef182cc42f9d94e44945b72593a9c881 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Jan 5 18:34:37 2012 +0100 update recommended-versions for 2.2.35-4 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 293d0b4..f1e681b 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.35-3-Linux-i686", -"2.2.35-3-Linux-x86_64", -"2.2.35-3-MacOS-i386", -"2.2.35-3-MacOS-x86_64", -"2.2.35-3-Windows" +"2.2.35-4-Linux-i686", +"2.2.35-4-Linux-x86_64", +"2.2.35-4-MacOS-i386", +"2.2.35-4-MacOS-x86_64", +"2.2.35-4-Windows" ]

1 0

[tor/master] Remove extraneous incorrect check for net/if.h
by nickm＠torproject.org 05 Jan '12

05 Jan '12

commit 13b2aa659833b52a62123cd0b3dc48caa7ee1019 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 5 12:25:31 2012 -0500 Remove extraneous incorrect check for net/if.h Fixes bug 4829; bug not in any released tor. --- configure.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index c167b8d..f4a8e1e 100644 --- a/configure.in +++ b/configure.in @@ -635,7 +635,6 @@ AC_CHECK_HEADERS( malloc/malloc.h \ malloc_np.h \ netdb.h \ - net/if.h \ netinet/in.h \ netinet/in6.h \ pwd.h \

1 0