February 2013 - tor-commits - lists.torproject.org

[torbrowser/maint-2.4] OSX: use make package to get Firefox's omni.ja
by erinn＠torproject.org 05 Feb '13

05 Feb '13

commit 22c493a03ebc440dc6c16c08455053c322afd16b Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Feb 5 14:51:39 2013 +0100 OSX: use make package to get Firefox's omni.ja --- build-scripts/osx-alpha.mk | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 8e339f7..95dc973 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -129,11 +129,12 @@ build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE) cp config/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig cp branding/* $(FIREFOX_DIR)/browser/branding/official cd $(FIREFOX_DIR) && make -f client.mk build + cd $(FIREFOX_DIR) && make -C obj* package touch $(STAMP_DIR)/build-firefox copy-firefox: -rm -rf $(BUILD_DIR)/TorBrowser.app - cp -r $(FIREFOX_DIR)/obj*/dist/*.app $(BUILD_DIR)/TorBrowser.app + cp -r $(FIREFOX_DIR)/obj*/dist/firefox/*.app $(BUILD_DIR)/TorBrowser.app build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox copy-firefox build-obfsproxy echo "If we're here, we've done something right."

1 0

[torbrowser/master] bump alpha TBBs for Tor 0.2.4.10-alpha
by erinn＠torproject.org 05 Feb '13

05 Feb '13

commit 0f214a5027b3299f522e2ebe73c3936428743dfe Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Feb 5 13:02:59 2013 +0100 bump alpha TBBs for Tor 0.2.4.10-alpha --- README.LINUX-2.4 | 5 +++-- README.OSX-2.4 | 5 +++-- README.WIN-2.4 | 5 +++-- build-scripts/versions-alpha.mk | 6 +++--- changelog.linux-2.4 | 8 ++++++++ changelog.osx-2.4 | 8 ++++++++ changelog.windows-2.4 | 8 ++++++++ 7 files changed, 36 insertions(+), 9 deletions(-) diff --git a/README.LINUX-2.4 b/README.LINUX-2.4 index a38c444..2482e2c 100644 --- a/README.LINUX-2.4 +++ b/README.LINUX-2.4 @@ -5,11 +5,12 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.9-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.4.10-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 17.0.2esr \_ Torbutton 1.5.0pre-alpha - |_ NoScript 2.6.4.3 + |_ NoScript 2.6.4.4 |_ HTTPS-Everywhere 4.0development.5 + |_ PDF Viewer 0.7.1 Usage ----- diff --git a/README.OSX-2.4 b/README.OSX-2.4 index 1c71e3c..4607cea 100644 --- a/README.OSX-2.4 +++ b/README.OSX-2.4 @@ -5,11 +5,12 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.9-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.4.10-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 17.0.2esr \_ Torbutton 1.5.0pre-alpha - |_ NoScript 2.6.4.3 + |_ NoScript 2.6.4.4 |_ HTTPS-Everywhere 4.0development.5 + |_ PDF Viewer 0.7.1 Usage ----- diff --git a/README.WIN-2.4 b/README.WIN-2.4 index 227a022..7caf620 100644 --- a/README.WIN-2.4 +++ b/README.WIN-2.4 @@ -5,11 +5,12 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.9-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.4.10-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 17.0.2esr \_ Torbutton 1.5.0pre-alpha - |_ NoScript 2.6.4.3 + |_ NoScript 2.6.4.4 |_ HTTPS-Everywhere 4.0development.5 + |_ PDF Viewer 0.7.1 Usage ----- diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index dcc5b10..70f5a17 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.4.9-alpha +RELEASE_VER=2.4.10-alpha ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c @@ -8,12 +8,12 @@ LIBPNG_VER=1.5.13 QT_VER=4.8.1 VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable -TOR_VER=0.2.4.9-alpha +TOR_VER=0.2.4.10-alpha PIDGIN_VER=2.6.4 FIREFOX_VER=17.0.2esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.0pre-alpha -NOSCRIPT_VER=2.6.4.3 +NOSCRIPT_VER=2.6.4.4 HTTPSEVERYWHERE_VER=4.0development.5 PDFJS_VER=0.7.1 OBFSPROXY_VER=0.1.4 diff --git a/changelog.linux-2.4 b/changelog.linux-2.4 index 2c31e07..52390ad 100644 --- a/changelog.linux-2.4 +++ b/changelog.linux-2.4 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.4.10-alpha-1); suite=linux + + * Update Tor to 0.2.4.10-alpha + * Update NoScript to 2.6.4.4 + * Add PDF Viewer (PDF.js) to README + + -- Erinn Clark <erinn(a)torproject.org> Tue Feb 5 12:59:27 CET 2013 + Tor Browser Bundle (2.4.9-alpha-1); suite=linux * Update Firefox to 17.0.2esr diff --git a/changelog.osx-2.4 b/changelog.osx-2.4 index 1b2f23a..d3271f8 100644 --- a/changelog.osx-2.4 +++ b/changelog.osx-2.4 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.4.10-alpha-1); suite=osx + + * Update Tor to 0.2.4.10-alpha + * Update NoScript to 2.6.4.4 + * Add PDF Viewer (PDF.js) to README + + -- Erinn Clark <erinn(a)torproject.org> Tue Feb 5 12:59:21 CET 2013 + Tor Browser Bundle (2.4.9-alpha-1); suite=osx * Update Firefox to 17.0.2esr diff --git a/changelog.windows-2.4 b/changelog.windows-2.4 index bd48ebd..434aa07 100644 --- a/changelog.windows-2.4 +++ b/changelog.windows-2.4 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.4.10-alpha-1); suite=windows + + * Update Tor to 0.2.4.10-alpha + * Update NoScript to 2.6.4.4 + * Add PDF Viewer (PDF.js) to README + + -- Erinn Clark <erinn(a)torproject.org> Tue Feb 5 12:59:23 CET 2013 + Tor Browser Bundle (2.4.9-alpha-test-1); suite=windows * Update Firefox to 17.0.2esr

1 0

[torbrowser/maint-2.4] bump alpha TBBs for Tor 0.2.4.10-alpha
by erinn＠torproject.org 05 Feb '13

05 Feb '13

commit 0f214a5027b3299f522e2ebe73c3936428743dfe Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Feb 5 13:02:59 2013 +0100 bump alpha TBBs for Tor 0.2.4.10-alpha --- README.LINUX-2.4 | 5 +++-- README.OSX-2.4 | 5 +++-- README.WIN-2.4 | 5 +++-- build-scripts/versions-alpha.mk | 6 +++--- changelog.linux-2.4 | 8 ++++++++ changelog.osx-2.4 | 8 ++++++++ changelog.windows-2.4 | 8 ++++++++ 7 files changed, 36 insertions(+), 9 deletions(-) diff --git a/README.LINUX-2.4 b/README.LINUX-2.4 index a38c444..2482e2c 100644 --- a/README.LINUX-2.4 +++ b/README.LINUX-2.4 @@ -5,11 +5,12 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.9-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.4.10-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 17.0.2esr \_ Torbutton 1.5.0pre-alpha - |_ NoScript 2.6.4.3 + |_ NoScript 2.6.4.4 |_ HTTPS-Everywhere 4.0development.5 + |_ PDF Viewer 0.7.1 Usage ----- diff --git a/README.OSX-2.4 b/README.OSX-2.4 index 1c71e3c..4607cea 100644 --- a/README.OSX-2.4 +++ b/README.OSX-2.4 @@ -5,11 +5,12 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.9-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.4.10-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 17.0.2esr \_ Torbutton 1.5.0pre-alpha - |_ NoScript 2.6.4.3 + |_ NoScript 2.6.4.4 |_ HTTPS-Everywhere 4.0development.5 + |_ PDF Viewer 0.7.1 Usage ----- diff --git a/README.WIN-2.4 b/README.WIN-2.4 index 227a022..7caf620 100644 --- a/README.WIN-2.4 +++ b/README.WIN-2.4 @@ -5,11 +5,12 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.9-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.4.10-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 17.0.2esr \_ Torbutton 1.5.0pre-alpha - |_ NoScript 2.6.4.3 + |_ NoScript 2.6.4.4 |_ HTTPS-Everywhere 4.0development.5 + |_ PDF Viewer 0.7.1 Usage ----- diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index dcc5b10..70f5a17 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.4.9-alpha +RELEASE_VER=2.4.10-alpha ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c @@ -8,12 +8,12 @@ LIBPNG_VER=1.5.13 QT_VER=4.8.1 VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable -TOR_VER=0.2.4.9-alpha +TOR_VER=0.2.4.10-alpha PIDGIN_VER=2.6.4 FIREFOX_VER=17.0.2esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.0pre-alpha -NOSCRIPT_VER=2.6.4.3 +NOSCRIPT_VER=2.6.4.4 HTTPSEVERYWHERE_VER=4.0development.5 PDFJS_VER=0.7.1 OBFSPROXY_VER=0.1.4 diff --git a/changelog.linux-2.4 b/changelog.linux-2.4 index 2c31e07..52390ad 100644 --- a/changelog.linux-2.4 +++ b/changelog.linux-2.4 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.4.10-alpha-1); suite=linux + + * Update Tor to 0.2.4.10-alpha + * Update NoScript to 2.6.4.4 + * Add PDF Viewer (PDF.js) to README + + -- Erinn Clark <erinn(a)torproject.org> Tue Feb 5 12:59:27 CET 2013 + Tor Browser Bundle (2.4.9-alpha-1); suite=linux * Update Firefox to 17.0.2esr diff --git a/changelog.osx-2.4 b/changelog.osx-2.4 index 1b2f23a..d3271f8 100644 --- a/changelog.osx-2.4 +++ b/changelog.osx-2.4 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.4.10-alpha-1); suite=osx + + * Update Tor to 0.2.4.10-alpha + * Update NoScript to 2.6.4.4 + * Add PDF Viewer (PDF.js) to README + + -- Erinn Clark <erinn(a)torproject.org> Tue Feb 5 12:59:21 CET 2013 + Tor Browser Bundle (2.4.9-alpha-1); suite=osx * Update Firefox to 17.0.2esr diff --git a/changelog.windows-2.4 b/changelog.windows-2.4 index bd48ebd..434aa07 100644 --- a/changelog.windows-2.4 +++ b/changelog.windows-2.4 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.4.10-alpha-1); suite=windows + + * Update Tor to 0.2.4.10-alpha + * Update NoScript to 2.6.4.4 + * Add PDF Viewer (PDF.js) to README + + -- Erinn Clark <erinn(a)torproject.org> Tue Feb 5 12:59:23 CET 2013 + Tor Browser Bundle (2.4.9-alpha-test-1); suite=windows * Update Firefox to 17.0.2esr

1 0

[metrics-web/master] Add HSDir to relay flags graph.
by karsten＠torproject.org 05 Feb '13

05 Feb '13

commit aec90f18676bd9d53389692791f3240ef1b336aa Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Feb 5 12:20:05 2013 +0100 Add HSDir to relay flags graph. --- db/tordir.sql | 35 ++++++++++++++++++-- rserve/csv.R | 3 +- rserve/graphs.R | 6 ++-- .../ernie/web/graphs/GraphParameterChecker.java | 4 +- web/WEB-INF/network.jsp | 3 +- 5 files changed, 41 insertions(+), 10 deletions(-) diff --git a/db/tordir.sql b/db/tordir.sql index 571a324..e62732d 100644 --- a/db/tordir.sql +++ b/db/tordir.sql @@ -154,6 +154,15 @@ CREATE TABLE network_size ( avg_guard INTEGER NOT NULL, avg_fast INTEGER NOT NULL, avg_stable INTEGER NOT NULL, + avg_authority INTEGER NOT NULL, + avg_badexit INTEGER NOT NULL, + avg_baddirectory INTEGER NOT NULL, + avg_hsdir INTEGER NOT NULL, + avg_named INTEGER NOT NULL, + avg_unnamed INTEGER NOT NULL, + avg_valid INTEGER NOT NULL, + avg_v2dir INTEGER NOT NULL, + avg_v3dir INTEGER NOT NULL, CONSTRAINT network_size_pkey PRIMARY KEY(date) ); @@ -398,20 +407,40 @@ CREATE OR REPLACE FUNCTION refresh_network_size() RETURNS INTEGER AS $$ EXECUTE ' INSERT INTO network_size - (date, avg_running, avg_exit, avg_guard, avg_fast, avg_stable) + (date, avg_running, avg_exit, avg_guard, avg_fast, avg_stable, + avg_authority, avg_badexit, avg_baddirectory, avg_hsdir, + avg_named, avg_unnamed, avg_valid, avg_v2dir, avg_v3dir) SELECT date, isrunning / count AS avg_running, isexit / count AS avg_exit, isguard / count AS avg_guard, isfast / count AS avg_fast, - isstable / count AS avg_stable + isstable / count AS avg_stable, + isauthority / count as avg_authority, + isbadexit / count as avg_badexit, + isbaddirectory / count as avg_baddirectory, + ishsdir / count as avg_hsdir, + isnamed / count as avg_named, + isunnamed / count as avg_unnamed, + isvalid / count as avg_valid, + isv2dir / count as avg_v2dir, + isv3dir / count as avg_v3dir FROM ( SELECT DATE(validafter) AS date, COUNT(*) AS isrunning, COUNT(NULLIF(isexit, FALSE)) AS isexit, COUNT(NULLIF(isguard, FALSE)) AS isguard, COUNT(NULLIF(isfast, FALSE)) AS isfast, - COUNT(NULLIF(isstable, FALSE)) AS isstable + COUNT(NULLIF(isstable, FALSE)) AS isstable, + COUNT(NULLIF(isauthority, FALSE)) AS isauthority, + COUNT(NULLIF(isbadexit, FALSE)) AS isbadexit, + COUNT(NULLIF(isbaddirectory, FALSE)) AS isbaddirectory, + COUNT(NULLIF(ishsdir, FALSE)) AS ishsdir, + COUNT(NULLIF(isnamed, FALSE)) AS isnamed, + COUNT(NULLIF(isunnamed, FALSE)) AS isunnamed, + COUNT(NULLIF(isvalid, FALSE)) AS isvalid, + COUNT(NULLIF(isv2dir, FALSE)) AS isv2dir, + COUNT(NULLIF(isv3dir, FALSE)) AS isv3dir FROM statusentry WHERE isrunning = TRUE AND validafter >= ''' || min_date || ''' diff --git a/rserve/csv.R b/rserve/csv.R index f8c21b1..9fdfbbd 100644 --- a/rserve/csv.R +++ b/rserve/csv.R @@ -126,7 +126,8 @@ export_relayflags <- function(path) { drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, avg_running AS running, avg_exit AS exit,", - "avg_guard AS guard, avg_fast AS fast, avg_stable AS stable", + "avg_guard AS guard, avg_fast AS fast, avg_stable AS stable,", + "avg_hsdir AS hsdir", "FROM network_size WHERE date < current_date - 1 ORDER BY date") rs <- dbSendQuery(con, q) relayflags <- fetch(rs, n = -1) diff --git a/rserve/graphs.R b/rserve/graphs.R index 2a59396..72bbc1e 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -606,7 +606,7 @@ plot_relayflags <- function(start, end, flags, path) { networksize <- rbind(data.frame( date = as.Date(end) + 1, variable = paste("avg_", c("running", "exit", "guard", "fast", - "stable"), sep = ""), + "stable", "hsdir"), sep = ""), value = NA), networksize) dates <- seq(from = as.Date(start, "%Y-%m-%d"), to = as.Date(end, "%Y-%m-%d"), by="1 day") @@ -615,7 +615,7 @@ plot_relayflags <- function(start, end, flags, path) { networksize <- rbind(data.frame( date = as.Date(rep(missing, 5), origin = "1970-01-01"), variable = paste("avg_", c("running", "exit", "guard", "fast", - "stable"), sep = ""), + "stable", "hsdir"), sep = ""), value = rep(NA, length(missing) * 5)), networksize) date_breaks <- date_breaks( as.numeric(max(as.Date(end, "%Y-%m-%d")) - @@ -629,7 +629,7 @@ plot_relayflags <- function(start, end, flags, path) { scale_y_continuous(name = "", limits = c(0, max(networksize$value, na.rm = TRUE))) + scale_colour_manual(name = "Relay flags", values = c("#E69F00", - "#56B4E9", "#009E73", "#000000", "#0072B2"), + "#56B4E9", "#009E73", "#EE6A50", "#000000", "#0072B2"), breaks = paste("avg_", tolower(flags), sep = ""), labels = flags) + opts(title = "Number of relays with relay flags assigned\n") diff --git a/src/org/torproject/ernie/web/graphs/GraphParameterChecker.java b/src/org/torproject/ernie/web/graphs/GraphParameterChecker.java index a47538e..8300be5 100644 --- a/src/org/torproject/ernie/web/graphs/GraphParameterChecker.java +++ b/src/org/torproject/ernie/web/graphs/GraphParameterChecker.java @@ -49,7 +49,7 @@ public class GraphParameterChecker { this.knownParameterValues = new HashMap<String, String>(); this.knownParameterValues.put("flag", - "Running,Exit,Guard,Fast,Stable"); + "Running,Exit,Guard,Fast,Stable,HSDir"); StringBuilder sb = new StringBuilder("all"); for (String[] country : Countries.getInstance().getCountryList()) { sb.append("," + country[0]); @@ -142,7 +142,7 @@ public class GraphParameterChecker { } } } else { - flagParameters = this.knownParameterValues.get("flag").split(","); + flagParameters = "Running,Exit,Guard,Fast,Stable".split(","); } recognizedGraphParameters.put("flag", flagParameters); } diff --git a/web/WEB-INF/network.jsp b/web/WEB-INF/network.jsp index a43c46e..0b92c1a 100644 --- a/web/WEB-INF/network.jsp +++ b/web/WEB-INF/network.jsp @@ -89,7 +89,7 @@ country.</p> <a name="relayflags"></a> <h3><a href="#relayflags" class="anchor">Relays with Exit, Fast, Guard, -and Stable flags</a></h3> +Stable, and HSDir flags</a></h3> <br> <p>The directory authorities assign certain flags to relays that clients use for their path selection decisions. The following graph shows the @@ -113,6 +113,7 @@ average number of relays with these flags assigned.</p> <input type="checkbox" name="flag" value="Fast"<c:if test="${fn:length(relayflags_flag) == 0 or fn:contains(fn:join(relayflags_flag, ','), 'Fast')}"> checked</c:if>> Fast <input type="checkbox" name="flag" value="Guard"<c:if test="${fn:length(relayflags_flag) == 0 or fn:contains(fn:join(relayflags_flag, ','), 'Guard')}"> checked</c:if>> Guard <input type="checkbox" name="flag" value="Stable"<c:if test="${fn:length(relayflags_flag) == 0 or fn:contains(fn:join(relayflags_flag, ','), 'Stable')}"> checked</c:if>> Stable + <input type="checkbox" name="flag" value="HSDir"<c:if test="${fn:length(relayflags_flag) > 0 and fn:contains(fn:join(relayflags_flag, ','), 'HSDir')}"> checked</c:if>> HSDir </p><p> <input class="submit" type="submit" value="Update graph"> </p>

1 0

[tor/master] revise history
by arma＠torproject.org 05 Feb '13

05 Feb '13

commit b4a68d174793dddf2969e08dc4facd758a4f2680 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 5 00:48:24 2013 -0500 revise history --- ChangeLog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ed7f56..cd7f691 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,11 +8,11 @@ Changes in version 0.2.4.10-alpha - 2013-02-04 o Major bugfixes (directory authority): - When computing directory thresholds, ignore any rejected-as-sybil nodes during the computation so that they can't influence Fast, - Guard, etc. (We shoud have done this for proposal 109.) Fixes + Guard, etc. (We should have done this for proposal 109.) Fixes bug 8146. - When marking a node as a likely sybil, reset its uptime metrics to zero, so that it cannot time towards getting marked as Guard, - Stable, or HSDir. (We shoud have done this for proposal 109.) Fixes + Stable, or HSDir. (We should have done this for proposal 109.) Fixes bug 8147. o Major bugfixes:

1 0

[tor/master] Merge remote-tracking branch 'public/bug8151'
by nickm＠torproject.org 05 Feb '13

05 Feb '13

commit 2dcad03eba5ece3fa927623b41802a7ea11d95dd Merge: 2c73fe5 cd4ad45 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 5 00:33:04 2013 -0500 Merge remote-tracking branch 'public/bug8151' changes/bug8151 | 5 +++++ src/or/dirserv.c | 24 ++++++++++++++++++++++++ src/or/dirserv.h | 1 + src/or/dirvote.c | 5 +++++ 4 files changed, 35 insertions(+), 0 deletions(-)

1 0

[tor/master] Include a flag-thresholds line in each vote to describe flag cutoffs
by nickm＠torproject.org 05 Feb '13

05 Feb '13

commit cd4ad45ba31f4ae08aa185f358ee56721a06170b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 4 13:44:05 2013 -0500 Include a flag-thresholds line in each vote to describe flag cutoffs Implements ticket 8151. --- changes/bug8151 | 5 +++++ src/or/dirserv.c | 24 ++++++++++++++++++++++++ src/or/dirserv.h | 1 + src/or/dirvote.c | 5 +++++ 4 files changed, 35 insertions(+), 0 deletions(-) diff --git a/changes/bug8151 b/changes/bug8151 new file mode 100644 index 0000000..e20fa3c --- /dev/null +++ b/changes/bug8151 @@ -0,0 +1,5 @@ + o Minor features (directory authority): + - Include inside each vote a statement of the performance + thresholds that made the authority vote for its flags. Implements + ticket 8151. + \ No newline at end of file diff --git a/src/or/dirserv.c b/src/or/dirserv.c index b59478e..6209842 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2059,6 +2059,30 @@ dirserv_compute_performance_thresholds(routerlist_t *rl, tor_free(wfus); } +/** Give a statement of our current performance thresholds for inclusion + * in a vote document. */ +char * +dirserv_get_flag_thresholds_line(void) +{ + char *result=NULL; + tor_asprintf(&result, + "stable-uptime=%lu stable-mtbf=%lu " + "fast-speed=%lu " + "guard-wfu=%.03f%% guard-tk=%lu " + "guard-bw-inc-exits=%lu guard-bw-exc-exits=%lu " + "enough-mtbf=%d", + (unsigned long)stable_uptime, + (unsigned long)stable_mtbf, + (unsigned long)fast_bandwidth, + guard_wfu*100, + (unsigned long)guard_tk, + (unsigned long)guard_bandwidth_including_exits, + (unsigned long)guard_bandwidth_excluding_exits, + enough_mtbf_info ? 1 : 0); + + return result; +} + /** Given a platform string as in a routerinfo_t (possibly null), return a * newly allocated version string for a networkstatus document, or NULL if the * platform doesn't give a Tor version. */ diff --git a/src/or/dirserv.h b/src/or/dirserv.h index 35b7bd0..add09f4 100644 --- a/src/or/dirserv.h +++ b/src/or/dirserv.h @@ -70,6 +70,7 @@ int list_server_status_v1(smartlist_t *routers, char **router_status_out, int for_controller); int dirserv_dump_directory_to_string(char **dir_out, crypto_pk_t *private_key); +char *dirserv_get_flag_thresholds_line(void); int directory_fetches_from_authorities(const or_options_t *options); int directory_fetches_dir_info_early(const or_options_t *options); diff --git a/src/or/dirvote.c b/src/or/dirvote.c index aee9a6e..43b9f5e 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -134,6 +134,8 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, char fu[ISO_TIME_LEN+1]; char vu[ISO_TIME_LEN+1]; char *flags = smartlist_join_strings(v3_ns->known_flags, " ", 0, NULL); + /* XXXX Abstraction violation: should be pulling a field out of v3_ns.*/ + char *flag_thresholds = dirserv_get_flag_thresholds_line(); char *params; authority_cert_t *cert = v3_ns->cert; char *methods = @@ -160,6 +162,7 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, "voting-delay %d %d\n" "%s" /* versions */ "known-flags %s\n" + "flag-thresholds %s\n" "params %s\n" "dir-source %s %s %s %s %d %d\n" "contact %s\n", @@ -169,6 +172,7 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, v3_ns->vote_seconds, v3_ns->dist_seconds, version_lines, flags, + flag_thresholds, params, voter->nickname, fingerprint, voter->address, fmt_addr32(addr), voter->dir_port, voter->or_port, @@ -181,6 +185,7 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, tor_free(params); tor_free(flags); + tor_free(flag_thresholds); tor_free(methods); outp = status + strlen(status); endp = status + len;

1 0

[tor/master] bump to 0.2.4.10-alpha-dev
by arma＠torproject.org 04 Feb '13

04 Feb '13

commit 2c73fe5f5e8bce2f612e1bd60620f3bfbd1b847b Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Feb 4 18:20:13 2013 -0500 bump to 0.2.4.10-alpha-dev --- configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 182cc1b..c27cbd2 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.10-alpha]) +AC_INIT([tor],[0.2.4.10-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 2ee97ed..d5379bd 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.10-alpha" +!define VERSION "0.2.4.10-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 8a64114..4312d9f 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.10-alpha" +#define VERSION "0.2.4.10-alpha-dev"

1 0

r26045: {website} 0.2.4.10-alpha tarball is up (in website/trunk: . include)
by Roger Dingledine 04 Feb '13

04 Feb '13

Author: arma Date: 2013-02-04 23:10:03 +0000 (Mon, 04 Feb 2013) New Revision: 26045 Modified: website/trunk/Makefile website/trunk/include/versions.wmi Log: 0.2.4.10-alpha tarball is up Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2013-02-04 21:29:08 UTC (rev 26044) +++ website/trunk/Makefile 2013-02-04 23:10:03 UTC (rev 26045) @@ -11,7 +11,7 @@ # 5. ./publish export STABLETAG=tor-0.2.3.25 -export DEVTAG=tor-0.2.4.9-alpha +export DEVTAG=tor-0.2.4.10-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2013-02-04 21:29:08 UTC (rev 26044) +++ website/trunk/include/versions.wmi 2013-02-04 23:10:03 UTC (rev 26045) @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-alpha whitespace=delete>0.2.4.9-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.2.4.10-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.3.25</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.4.9-alpha</define-tag>

1 0

[tor/master] bump to 0.2.4.10-alpha
by arma＠torproject.org 04 Feb '13

04 Feb '13

commit 54f9a402c5f68633cc46c90364741fe1bd28e0da Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Feb 4 17:11:00 2013 -0500 bump to 0.2.4.10-alpha --- configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 6c4a079..182cc1b 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.9-alpha-dev]) +AC_INIT([tor],[0.2.4.10-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index c15a1a7..2ee97ed 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.9-alpha-dev" +!define VERSION "0.2.4.10-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index ef08fdb..8a64114 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.9-alpha-dev" +#define VERSION "0.2.4.10-alpha"

1 0