tor-commits

tor-commits@lists.torproject.org

1 participants
212454 discussions

[arm/master] fix: Unicode init needs to be before curses
by atagar＠torproject.org 25 May '11

25 May '11

commit d8ebaa88886c0aeb421623416990bd3058b175f9 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat May 21 13:36:19 2011 -0700 fix: Unicode init needs to be before curses The locale needs to be set before initializing curses for unicode characters to be rendered. --- src/cli/controller.py | 6 ------ src/starter.py | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 8222da8..d9895e6 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -4,7 +4,6 @@ user input to the proper panels. """ import time -import locale import curses import threading @@ -460,11 +459,6 @@ def drawTorMonitor(stdscr, startTime): try: curses.curs_set(0) except curses.error: pass - # If using our LANG variable for rendering multi-byte characters lets us - # get unicode support then then use it. - if uiTools.isUnicodeAvailable(): - locale.setlocale(locale.LC_ALL, "") - # logs the initialization time msg = "arm started (initialization took %0.3f seconds)" % (time.time() - startTime) log.log(CONFIG["log.startTime"], msg) diff --git a/src/starter.py b/src/starter.py index 84abbca..9268351 100644 --- a/src/starter.py +++ b/src/starter.py @@ -10,6 +10,7 @@ import os import sys import time import getopt +import locale import socket import platform @@ -397,5 +398,11 @@ if __name__ == '__main__': procName.renameProcess("arm\0%s" % "\0".join(sys.argv[1:])) except: pass + # If using our LANG variable for rendering multi-byte characters lets us + # get unicode support then then use it. This needs to be done before + # initializing curses. + if util.uiTools.isUnicodeAvailable(): + locale.setlocale(locale.LC_ALL, "") + cli.controller.startTorMonitor(time.time() - initTime)

1 0

r24786: {website} add rob to the board page. (website/trunk/about/en)
by Andrew Lewman 25 May '11

25 May '11

Author: phobos Date: 2011-05-25 15:51:16 +0000 (Wed, 25 May 2011) New Revision: 24786 Modified: website/trunk/about/en/board.wml Log: add rob to the board page. Modified: website/trunk/about/en/board.wml =================================================================== --- website/trunk/about/en/board.wml 2011-05-25 15:46:41 UTC (rev 24785) +++ website/trunk/about/en/board.wml 2011-05-25 15:51:16 UTC (rev 24786) @@ -33,7 +33,9 @@ <td class="beige"> <div class="name">Andrew Lewman</div> <div class="caps">Secretary, Treasurer, and Executive Director</div> - <p>Andrew is the Executive Director reponsible for all operations of The Tor Project, Inc. His current activities can be found at <a href="http://lewman.com">his website</a>.</p> + <p>Andrew is the Executive Director reponsible for all + operations of The Tor Project, Inc. His current activities + can be found at <a href="http://lewman.is">his website</a>.</p> </td> </tr> <tr> @@ -60,6 +62,15 @@ <p>Lawyer, cyberlaw professor, and founder of <a href="http://chillingeffects.org/">ChillingEffects.org</a>.</p> </td> </tr> + <tr> + <td class="beige"> + <div class="name">Rob Thomas</div> + <div class="caps">Director</div> + <p>Rob Thomas is CEO and founder of Team Cymru, and a + Cymru Fellow. You can learn more about Rob at the <a + href="http://www.team-cymru.org/">Team Cymru</a> websites.</p> + </td> + </tr> </table>  </div>

1 0

r24785: {website} remove linus from the volunteer page since he's already on t (website/trunk/about/en)
by Andrew Lewman 25 May '11

25 May '11

Author: phobos Date: 2011-05-25 15:46:41 +0000 (Wed, 25 May 2011) New Revision: 24785 Modified: website/trunk/about/en/volunteers.wml Log: remove linus from the volunteer page since he's already on the core people page. Modified: website/trunk/about/en/volunteers.wml =================================================================== --- website/trunk/about/en/volunteers.wml 2011-05-24 03:20:22 UTC (rev 24784) +++ website/trunk/about/en/volunteers.wml 2011-05-25 15:46:41 UTC (rev 24785) @@ -30,8 +30,6 @@ questions and concerns.</dd> <dt>Shava Nerad</dt><dd>Our former Development Director. She still works on PR and community relations.</dd> -<dt>Linus Nordberg</dt><dd>Enjoys measuring the Tor network and helps -with outreach in the Nordic countries.</dd> <dt>Lasse Øverlier</dt><dd>Writes research papers on Tor: attacks, defenses, and resource management, especially for hidden services.</dd> <dt>Martin Peck</dt><dd>Working on a VM-based transparent

1 0

[metrics-tasks/master] Add another graph for #3277.
by karsten＠torproject.org 25 May '11

25 May '11

commit a7ad71b01533b64e2d5e0b9c4f0f8f63d8d2a593 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 25 08:02:13 2011 +0200 Add another graph for #3277. --- task-3277/hsdir-sessions.R | 38 ++++++++++++++++++++++++++++++++++---- 1 files changed, 34 insertions(+), 4 deletions(-) diff --git a/task-3277/hsdir-sessions.R b/task-3277/hsdir-sessions.R index 4b28131..51633f5 100644 --- a/task-3277/hsdir-sessions.R +++ b/task-3277/hsdir-sessions.R @@ -7,10 +7,28 @@ data <- read.csv("hsdir-sessions.csv", stringsAsFactors = FALSE) #scale_x_continuous(limits = c(0, 72)) + #scale_y_continuous(formatter = "percent") -data <- sort(data$duration) -data <- data.frame(x = data / (60 * 60), - y = (length(data):1) / length(data)) -ggplot(data, aes(x = x, y = y)) + +# We want to compare actual session times to... +hour24 <- sort(data$duration) + +# ... simulated session times if HSDir flags would have been assigned +# after 25 or 26 hours, not 24. +hour25 <- data[data$duration >= 3600, "duration"] +hour25 <- sort(hour25) - 3600 +hour26 <- data[data$duration >= 7200, "duration"] +hour26 <- sort(hour26) - 7200 + +data <- rbind( + data.frame(x = hour24 / (60 * 60), + y = (length(hour24):1) / length(hour24), + type = "24 hours (implemented)"), + data.frame(x = hour25 / (60 * 60), + y = (length(hour25):1) / length(hour25), + type = "25 hours (simulated)"), + data.frame(x = hour26 / (60 * 60), + y = (length(hour26):1) / length(hour26), + type = "26 hours (simulated)")) + +ggplot(data[data$type == "24 hours (implemented)", ], aes(x = x, y = y)) + geom_line() + scale_y_continuous("Cumulative fraction of continuous HSDir sessions\n", formatter = "percent", limits = c(0, 1)) + @@ -19,3 +37,15 @@ scale_x_continuous(paste("\nHSDir session time between the relay earning", limits = c(0, 3 * 24), breaks = seq(0, 3 * 24, 24)) ggsave(filename = "hsdir-sessions.png", width = 8, height = 5, dpi = 72) +ggplot(data, aes(x = x, y = y, colour = type)) + +geom_line() + +scale_y_continuous("Cumulative fraction of continuous HSDir sessions\n", + formatter = "percent", limits = c(0, 1)) + +scale_x_continuous(paste("\nHSDir session time between the relay earning", + "the HSDir flag and going away in hours"), + limits = c(0, 3 * 24), breaks = seq(0, 3 * 24, 24)) + +scale_colour_hue("HSDir flag assignment after") + +opts(legend.position = "top") +ggsave(filename = "hsdir-sessions-sim.png", width = 8, height = 5, + dpi = 72) +

1 0

[metrics-tasks/master] Fix indentation in global LICENSE
by karsten＠torproject.org 25 May '11

25 May '11

commit 9328c2b7b35be1affe31b4a5d6aaee6e311ab954 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Mar 16 10:36:33 2011 -0700 Fix indentation in global LICENSE --- LICENSE | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/LICENSE b/LICENSE index d5b67cd..52fb34e 100644 --- a/LICENSE +++ b/LICENSE @@ -12,7 +12,7 @@ met: in the documentation and/or other materials provided with the distribution. - * Neither the names of the copyright owners nor the names of its +* Neither the names of the copyright owners nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

1 0

[metrics-tasks/master] Commit HSDir-set-listing scripts for #2649
by karsten＠torproject.org 25 May '11

25 May '11

commit 22eb1da05f6a0b667f9ba03ca700fc341a3722f6 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue May 24 13:06:02 2011 -0700 Commit HSDir-set-listing scripts for #2649 The scripts were done early on 2011-04-18, but never committed. --- task-2649/.gitignore | 2 + task-2649/README | 31 ++++++++++++++++++++++++++++++ task-2649/generate-consensus-hsdir-lists | 28 +++++++++++++++++++++++++++ task-2649/list-consensus-hsdirs | 19 ++++++++++++++++++ task-2649/list-consensus-hsdirs.awk | 25 ++++++++++++++++++++++++ 5 files changed, 105 insertions(+), 0 deletions(-) diff --git a/task-2649/.gitignore b/task-2649/.gitignore new file mode 100644 index 0000000..c77b69b --- /dev/null +++ b/task-2649/.gitignore @@ -0,0 +1,2 @@ +dev/ +out/ diff --git a/task-2649/README b/task-2649/README new file mode 100644 index 0000000..4283696 --- /dev/null +++ b/task-2649/README @@ -0,0 +1,31 @@ + +Purpose: + + These scripts are intended to determine how unstable the set of + relays with the HSDir flag is. + +Dependencies: + + You will need linedemux and linemux installed. See branch parrun in + https://gitweb.torproject.org/rransom/tor-utils.git for now. + + You will also need Tcl 8.5.9 and gnuplot 4.4.0 installed. + +Instructions: + + First, unpack all of the v3 consensus archive tarballs you want to + analyze into a single directory, and set the consensus_archive_dir + environment variable to point to that directory. + + Then run: + + ./generate-consensus-hsdir-lists + ./compute-hsdir-set-instability + ./graph-hsdir-set-instability + +Bugs: + + This code compares each consensus with each of the four following + consensuses; it should compare each hour's consensus with the + consensuses in effect in each of the four following hours. + diff --git a/task-2649/generate-consensus-hsdir-lists b/task-2649/generate-consensus-hsdir-lists new file mode 100755 index 0000000..104e4bc --- /dev/null +++ b/task-2649/generate-consensus-hsdir-lists @@ -0,0 +1,28 @@ +#!/bin/sh + +# This script must be run as ./generate-consensus-hsdir-lists . + +# This script will die horribly later if $consensus_archive_dir +# expands to a string containing a shell metacharacter, so don't try +# to not die now. +test -z $consensus_archive_dir && +export consensus_archive_dir=/usr/local/opt/tor-consensuses + + +mkdir -m 0700 -p dev/ +for i in 0 1 2 3 ;do mkfifo -m 0600 dev/in$i dev/out$i ;done + +mkdir -p out/consensus-hsdir-lists + + +(cd "$consensus_archive_dir" ;find consensuses-* -type f -print ) | +sed -e 's|^|./list-consensus-hsdirs |' | +linedemux --fname -- dev/in0 dev/in1 dev/in2 dev/in3 & + +sh <dev/in0 >dev/out0 & +sh <dev/in1 >dev/out1 & +sh <dev/in2 >dev/out2 & +sh <dev/in3 >dev/out3 & + +linemux --fname -- dev/out0 dev/out1 dev/out2 dev/out3 + diff --git a/task-2649/list-consensus-hsdirs b/task-2649/list-consensus-hsdirs new file mode 100755 index 0000000..1b10243 --- /dev/null +++ b/task-2649/list-consensus-hsdirs @@ -0,0 +1,19 @@ +#!/bin/sh + +# This script must be run as ./list-consensus-hsdirs , by +# generate-consensus-hsdir-lists. + +consensus_file="$1" + + +consensus_basename="$(basename "$consensus_file" -consensus )" +hsdir_list_dir="out/consensus-hsdir-lists/$(echo "$consensus_basename" |cut -f 1-2 -d - )" +hsdir_list_name="$hsdir_list_dir/$consensus_basename" + + +mkdir -p "$hsdir_list_dir" + +awk -f list-consensus-hsdirs.awk <"$consensus_archive_dir/$consensus_file" >"$hsdir_list_name" + +echo "generated HSDir list $consensus_basename" + diff --git a/task-2649/list-consensus-hsdirs.awk b/task-2649/list-consensus-hsdirs.awk new file mode 100644 index 0000000..343c5e7 --- /dev/null +++ b/task-2649/list-consensus-hsdirs.awk @@ -0,0 +1,25 @@ + +BEGIN { + OFS=":" + idDigest="<oops>" +} + +$1 == "r" { + idDigest=$3 +} + +$1 == "s" { + isHSDir=0 + for (i = NF; i >= 1; --i) { + if ($i == "HSDir") { + isHSDir=1 + } + } + + if (isHSDir != 0) { + print idDigest + } + + idDigest="<oops>" +} +

1 0

[metrics-tasks/master] Use sh -e
by karsten＠torproject.org 25 May '11

25 May '11

commit 65e0dfc58c728c2e54042f4f6eba1a812628cf64 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue May 24 14:36:07 2011 -0700 Use sh -e --- task-2649/generate-consensus-hsdir-lists | 2 +- task-2649/list-consensus-hsdirs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/task-2649/generate-consensus-hsdir-lists b/task-2649/generate-consensus-hsdir-lists index 104e4bc..7dea186 100755 --- a/task-2649/generate-consensus-hsdir-lists +++ b/task-2649/generate-consensus-hsdir-lists @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e # This script must be run as ./generate-consensus-hsdir-lists . diff --git a/task-2649/list-consensus-hsdirs b/task-2649/list-consensus-hsdirs index 1b10243..d6edb27 100755 --- a/task-2649/list-consensus-hsdirs +++ b/task-2649/list-consensus-hsdirs @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e # This script must be run as ./list-consensus-hsdirs , by # generate-consensus-hsdir-lists.

1 0

[metrics-tasks/master] Make generate-consensus-hsdir-lists ignore mkfifo errors again
by karsten＠torproject.org 25 May '11

25 May '11

commit 52be34ebc070ae7979489335116827b7dd55cf3c Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue May 24 17:12:31 2011 -0700 Make generate-consensus-hsdir-lists ignore mkfifo errors again --- task-2649/generate-consensus-hsdir-lists | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/task-2649/generate-consensus-hsdir-lists b/task-2649/generate-consensus-hsdir-lists index 7dea186..9c09ac8 100755 --- a/task-2649/generate-consensus-hsdir-lists +++ b/task-2649/generate-consensus-hsdir-lists @@ -10,7 +10,7 @@ export consensus_archive_dir=/usr/local/opt/tor-consensuses mkdir -m 0700 -p dev/ -for i in 0 1 2 3 ;do mkfifo -m 0600 dev/in$i dev/out$i ;done +for i in 0 1 2 3 ;do mkfifo -m 0600 dev/in$i dev/out$i || true ;done mkdir -p out/consensus-hsdir-lists

1 0

[metrics-tasks/master] Add compute-hsdir-set-instability
by karsten＠torproject.org 25 May '11

25 May '11

commit 1532d9ed415ba4f5db6d888589dc48d22de6e42d Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue May 24 17:18:59 2011 -0700 Add compute-hsdir-set-instability --- task-2649/compute-hsdir-set-instability | 12 ++++ task-2649/compute-hsdir-set-instability.tcl | 83 +++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 0 deletions(-) diff --git a/task-2649/compute-hsdir-set-instability b/task-2649/compute-hsdir-set-instability new file mode 100755 index 0000000..1a5e767 --- /dev/null +++ b/task-2649/compute-hsdir-set-instability @@ -0,0 +1,12 @@ +#!/bin/sh -e + +# This script must be run as ./compute-hsdir-set-instability . + + +find out/consensus-hsdir-lists -type f -print | +sort | +tclsh8.5 compute-hsdir-set-instability.tcl | +tee out/hsdir-set-instability | +sed -e 's/$/ /' | +tr '\n' '\r' + diff --git a/task-2649/compute-hsdir-set-instability.tcl b/task-2649/compute-hsdir-set-instability.tcl new file mode 100644 index 0000000..24afb97 --- /dev/null +++ b/task-2649/compute-hsdir-set-instability.tcl @@ -0,0 +1,83 @@ + +set hsdir_set_name_list {} + +array set hsdir_sets {} + +proc read_file_lines {filename} { + set chanid [open $filename r] + set contents [read -nonewline $chanid] + close $chanid + + return [split $contents "\n"] +} + +proc get_hsdir_set_name {filename} { + return [file tail $filename] +} + +proc read_hsdir_set {set_name filename} { + global hsdir_sets + + set hsdir_set [read_file_lines $filename] + set hsdir_sets($set_name) $hsdir_set +} + +proc forget_hsdir_set {name} { + unset -nocomplain hsdir_sets($name) +} + +proc list_set_symmetric_difference_size {l1 l2} { + set l1 [lsort -ascii -unique $l1] + set l2 [lsort -ascii -unique $l2] + set both [lsort -ascii -unique [concat $l1 $l2]] + + set l1i 0 + set l2i 0 + #set result {} + set result_length 0 + + foreach x $both { + set n_inputs_containing_x 0 + if {[lindex $l1 $l1i] eq $x} { + incr l1i + incr n_inputs_containing_x + } + if {[lindex $l2 $l2i] eq $x} { + incr l2i + incr n_inputs_containing_x + } + if {$n_inputs_containing_x & 1} { + #lappend result $x + incr result_length + } + } + + #return $result + return $result_length +} +rename list_set_symmetric_difference_size lssds + +while {![eof stdin]} { + set x [gets stdin hsdir_set_filename] + if {$x == -1} {break} + + set hsdir_set_name [get_hsdir_set_name $hsdir_set_filename] + read_hsdir_set $hsdir_set_name $hsdir_set_filename + + lappend hsdir_set_name_list $hsdir_set_name + + if {[llength $hsdir_set_name_list] == 5} { + lassign $hsdir_set_name_list set0 set1 set2 set3 set4 + + puts "$set0\ + [llength $hsdir_sets($set0)]\ + [lssds $hsdir_sets($set0) $hsdir_sets($set1)]\ + [lssds $hsdir_sets($set0) $hsdir_sets($set2)]\ + [lssds $hsdir_sets($set0) $hsdir_sets($set3)]\ + [lssds $hsdir_sets($set0) $hsdir_sets($set4)]" + + forget_hsdir_set [lindex $hsdir_set_name_list 0] + set hsdir_set_name_list [lrange $hsdir_set_name_list 1 end] + } +} +

1 0

[metrics-tasks/master] Merge branch 'task-2649'
by karsten＠torproject.org 25 May '11

25 May '11

commit f1267592c61dae5789c02ce1f10126674b1702b1 Merge: 0a10a39 1836cbe Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 25 07:28:11 2011 +0200 Merge branch 'task-2649' LICENSE | 2 +- task-2649/.gitignore | 2 + task-2649/README | 31 +++++++++ task-2649/compute-hsdir-set-instability | 12 ++++ task-2649/compute-hsdir-set-instability.tcl | 83 +++++++++++++++++++++++++ task-2649/generate-consensus-hsdir-lists | 28 ++++++++ task-2649/graph-hsdir-set-instability | 9 +++ task-2649/graph-hsdir-set-instability.gnuplot | 11 +++ task-2649/list-consensus-hsdirs | 19 ++++++ task-2649/list-consensus-hsdirs.awk | 25 ++++++++ 10 files changed, 221 insertions(+), 1 deletions(-)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits