- tor-commits - lists.torproject.org

[tor/master] Allow TestingTorNetwork when alternate dir and bridge authorities are set.
by nickm＠torproject.org 17 Jul '12

17 Jul '12

commit 21c6c8485367ce66ab0791c153177c17bccd25c5 Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Jul 11 11:53:07 2012 +0200 Allow TestingTorNetwork when alternate dir and bridge authorities are set. Allow TestingTorNetwork when AlternateDirAuthority and AlternateBridgeAuthority is set even if DirServer is not. --- changes/bug6377 | 4 ++++ src/or/config.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/bug6377 b/changes/bug6377 new file mode 100644 index 0000000..a3a3672 --- /dev/null +++ b/changes/bug6377 @@ -0,0 +1,4 @@ + o Testing: + - Make it possible to set the TestingTorNetwork configuration + option using AlternateDirAuthority and AlternateBridgeAuthority + as an alternative to setting DirServer. diff --git a/src/or/config.c b/src/or/config.c index d90e0fc..f5b5c8f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4091,9 +4091,13 @@ options_validate(or_options_t *old_options, or_options_t *options, }); } - if (options->TestingTorNetwork && !options->DirServers) { + if (options->TestingTorNetwork && + !(options->DirServers || + (options->AlternateDirAuthority && + options->AlternateBridgeAuthority))) { REJECT("TestingTorNetwork may only be configured in combination with " - "a non-default set of DirServers."); + "a non-default set of DirServer or both of AlternateDirAuthority " + "and AlternateBridgeAuthority configured."); } if (options->AllowSingleHopExits && !options->DirServers) {

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 17 Jul '12

17 Jul '12

commit 0b6fb5ebcdccd7267e60caf5418b31977c41f12c Merge: 7ac8a4a 21c6c84 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 17 09:50:18 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6377 | 4 ++++ src/or/config.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.3] Allow TestingTorNetwork when alternate dir and bridge authorities are set.
by nickm＠torproject.org 17 Jul '12

17 Jul '12

commit 21c6c8485367ce66ab0791c153177c17bccd25c5 Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Jul 11 11:53:07 2012 +0200 Allow TestingTorNetwork when alternate dir and bridge authorities are set. Allow TestingTorNetwork when AlternateDirAuthority and AlternateBridgeAuthority is set even if DirServer is not. --- changes/bug6377 | 4 ++++ src/or/config.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/bug6377 b/changes/bug6377 new file mode 100644 index 0000000..a3a3672 --- /dev/null +++ b/changes/bug6377 @@ -0,0 +1,4 @@ + o Testing: + - Make it possible to set the TestingTorNetwork configuration + option using AlternateDirAuthority and AlternateBridgeAuthority + as an alternative to setting DirServer. diff --git a/src/or/config.c b/src/or/config.c index d90e0fc..f5b5c8f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4091,9 +4091,13 @@ options_validate(or_options_t *old_options, or_options_t *options, }); } - if (options->TestingTorNetwork && !options->DirServers) { + if (options->TestingTorNetwork && + !(options->DirServers || + (options->AlternateDirAuthority && + options->AlternateBridgeAuthority))) { REJECT("TestingTorNetwork may only be configured in combination with " - "a non-default set of DirServers."); + "a non-default set of DirServer or both of AlternateDirAuthority " + "and AlternateBridgeAuthority configured."); } if (options->AllowSingleHopExits && !options->DirServers) {

1 0

[metrics-tasks/master] Plot 'degree of anonymity' instead of entropy.
by karsten＠torproject.org 17 Jul '12

17 Jul '12

commit e54b4278361184bf6ff90f189898668160474f2f Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jul 16 20:13:52 2012 +0200 Plot 'degree of anonymity' instead of entropy. 'Degree of anonymity' should give a more intuitive view of the situation. For more information, see section 3 of 'Towards measuring anonymity' by C. Diaz, S. Stefaan, J. Claessens and B. Preneel. --- task-6232/plot-entropy.R | 2 +- task-6232/pyentropy.py | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/task-6232/plot-entropy.R b/task-6232/plot-entropy.R index 95dbdcc..87035b9 100644 --- a/task-6232/plot-entropy.R +++ b/task-6232/plot-entropy.R @@ -10,7 +10,7 @@ d <- melt(d, "date") ggplot(d, aes(x = date, y = value, colour = variable)) + geom_line() + scale_x_date(name = "\nDate") + -scale_y_continuous(name = "Entropy\n") + +scale_y_continuous(name = "Degree of Anonymity\n") + scale_colour_hue(name = "Relays", breaks = c("all", "exit", "guard", "country"), labels = c("All relays", "All exits", "All guards", "All countries")) diff --git a/task-6232/pyentropy.py b/task-6232/pyentropy.py index b064339..abb716a 100644 --- a/task-6232/pyentropy.py +++ b/task-6232/pyentropy.py @@ -57,13 +57,16 @@ def run(file_name): router.add(key, values) totalBW, totalExitBW, totalGuardBW = 0, 0, 0 + guards_n, exits_n = 0, 0 bw_countries = {} for router in routers: totalBW += router.bandwidth if router.is_guard: totalGuardBW += router.bandwidth + guards_n += 1 if router.is_exit: totalExitBW += router.bandwidth + exits_n += 1 if bw_countries.has_key(router.country): bw_countries[router.country] += router.bandwidth else: @@ -90,8 +93,18 @@ def run(file_name): p = float(bw_countries[country]) / float(totalBW) if p != 0: entropy_country += -(p * math.log(p, 2)) - - return ",".join([valid_after, str(entropy), str(entropy_exit), str(entropy_guard), str(entropy_country)]) + + # Entropy of uniform distribution of 'n' possible values: log(n) + max_entropy = math.log(len(routers), 2) + max_entropy_guard = math.log(guards_n, 2) + max_entropy_exit = math.log(exits_n, 2) + max_entropy_country = math.log(len(bw_countries), 2) + + return ",".join([valid_after, + str(entropy/max_entropy), + str(entropy_exit/max_entropy_exit), + str(entropy_guard/max_entropy_guard), + str(entropy_country/max_entropy_country)]) def usage(): print "Usage - python pyentropy.py <consensus-dir> <output-file>"

1 0

[metrics-tasks/master] Merge remote-tracking branch 'asn/bug6232'
by karsten＠torproject.org 17 Jul '12

17 Jul '12

commit be16bde71a5b2e1e054bcf2e31cb2778be424541 Merge: 40eab19 e54b427 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jul 17 15:24:17 2012 +0200 Merge remote-tracking branch 'asn/bug6232' task-6232/plot-entropy.R | 2 +- task-6232/pyentropy.py | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-)

1 0

[flashproxy/master] Reset the line-height for the debug output.
by dcf＠torproject.org 17 Jul '12

17 Jul '12

commit 295f9d93d7c3af12c4ea343af2c14e78b56a46a5 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 17 05:44:33 2012 -0700 Reset the line-height for the debug output. I set the line-height to 0 for dimly remembered badge formatting reasons, but this was also taking effect in the textual terminal output, causing output lines to write atop one another. This was noticed by Joseph Hall. --- embed.html | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/embed.html b/embed.html index 678ba01..95821ce 100644 --- a/embed.html +++ b/embed.html @@ -71,6 +71,7 @@ body { overflow: auto; color: #4c4; background-color: #021; + line-height: inherit; } </style> </head>

1 0

[flashproxy/master] Add debug puts to show why the proxy is disabling itself.
by dcf＠torproject.org 17 Jul '12

17 Jul '12

commit 34ec1b386219d7a6da730ca0359049070897f4fe Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 17 05:42:00 2012 -0700 Add debug puts to show why the proxy is disabling itself. --- flashproxy.js | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 8f994f1..592074d 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -790,19 +790,24 @@ function flashproxy_should_disable() { var re = UA_LIST[i]; if (ua.match(re)) { + puts("Disable because User-Agent matches mobile pattern " + re + "."); return true; } } } - if (ua.match(/\bsafari\b/i) && !ua.match(/\bchrome\b/i)) + if (ua.match(/\bsafari\b/i) && !ua.match(/\bchrome\b/i)) { /* Disable on Safari because it doesn't have the hybi/RFC type of WebSockets. */ + puts("Disable because User-Agent is Safari."); return true; + } - if (!WebSocket) + if (!WebSocket) { /* No WebSocket support. */ + puts("Disable because of no WebSocket support."); return true; + } return false; }

1 0

[flashproxy/master] Output consistency.
by dcf＠torproject.org 17 Jul '12

17 Jul '12

commit 7554cdbf6effae771707ed56684736fa01d24381 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 17 05:43:21 2012 -0700 Output consistency. --- flashproxy.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 592074d..6d70fe7 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -457,7 +457,7 @@ function FlashProxy() { /* Cease all network operations and prevent any future ones. */ this.disable = function() { - puts("disabling"); + puts("Disabling."); this.proxy_main = function() { }; this.make_proxy_pair = function(client_addr, relay_addr) { }; while (this.proxy_pairs.length > 0) @@ -466,7 +466,7 @@ function FlashProxy() { }; this.die = function() { - puts("die"); + puts("Dying."); this.badge.die(); }; }

1 0

[metrics-tasks/master] task-6329: Properly align relays with no country in 'relays' output
by karsten＠torproject.org 17 Jul '12

17 Jul '12

commit 03cc7a93996d441e9faf6839fba6a64c44e38672 Author: delber <delber(a)riseup.net> Date: Mon Jul 16 15:23:33 2012 +0000 task-6329: Properly align relays with no country in 'relays' output --- task-6329/tor-relays-stats.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/task-6329/tor-relays-stats.py b/task-6329/tor-relays-stats.py index 7efd623..d876c76 100755 --- a/task-6329/tor-relays-stats.py +++ b/task-6329/tor-relays-stats.py @@ -109,7 +109,7 @@ class RelayStats(object): selection_consensus_weight = 0 for relay in ranking[:count]: selection_consensus_weight += relay['consensus_weight'] - print "%8.4f%% %-19s %-2s %-4s %-5s %s %-7s %s" % (relay['consensus_weight'] * 100.0 / total_consensus_weight, relay['nickname'], relay['fingerprint'], 'Exit' if 'Exit' in set(relay['flags']) else '', 'Guard' if 'Guard' in set(relay['flags']) else '', relay.get('country', ''), relay.get('as_number', ''), relay.get('as_name', '')) + print "%8.4f%% %-19s %-2s %-4s %-5s %s %-7s %s" % (relay['consensus_weight'] * 100.0 / total_consensus_weight, relay['nickname'], relay['fingerprint'], 'Exit' if 'Exit' in set(relay['flags']) else '', 'Guard' if 'Guard' in set(relay['flags']) else '', relay.get('country', ' '), relay.get('as_number', ''), relay.get('as_name', '')) if len(ranking) > count: other_consensus_weight = 0 for relay in ranking[count:]:

1 0

[metrics-tasks/master] task-6329: Update README according to Karsten's change
by karsten＠torproject.org 17 Jul '12

17 Jul '12

commit a85ce0cc4e0b3ffd1740c8fba508bd1adb4f1b1b Author: delber <delber(a)riseup.net> Date: Mon Jul 16 15:15:17 2012 +0000 task-6329: Update README according to Karsten's change --- task-6329/README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/task-6329/README b/task-6329/README index d5b4c0f..0c6c501 100644 --- a/task-6329/README +++ b/task-6329/README @@ -14,7 +14,7 @@ Where <output> is one of: relative percentage of the consensus in each countries - as-sets [COUNT] [FLAGS] [COUNTRIES] relative percentage of the consensus in each AS sets - - relays [COUNT] [FLAGS] [COUNTRIES] + - relays [COUNT] [FLAGS] [COUNTRIES] [AS_SETS] list relays ranked by their place in the whole consensus Examples:

1 0