August 2011 - tor-commits - lists.torproject.org

r24965: {website} chiiph does Thandy now (website/trunk/getinvolved/en)
by Sebastian Hahn 25 Aug '11

25 Aug '11

Author: sebastian Date: 2011-08-25 21:16:49 +0000 (Thu, 25 Aug 2011) New Revision: 24965 Modified: website/trunk/getinvolved/en/volunteer.wml Log: chiiph does Thandy now Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2011-08-25 21:03:02 UTC (rev 24964) +++ website/trunk/getinvolved/en/volunteer.wml 2011-08-25 21:16:49 UTC (rev 24965) @@ -166,7 +166,7 @@ <td>Updater</td> <td>Python</td> <td>Light</td> - <td>Sebastian, Erinn, nickm</td> + <td>chiiph, Erinn, nickm</td> </tr> <tr class="alt">

1 0

r24964: {website} make sure we build the right man pages. (website/trunk)
by Andrew Lewman 25 Aug '11

25 Aug '11

Author: phobos Date: 2011-08-25 21:03:02 +0000 (Thu, 25 Aug 2011) New Revision: 24964 Modified: website/trunk/Makefile Log: make sure we build the right man pages. Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2011-08-25 16:50:25 UTC (rev 24963) +++ website/trunk/Makefile 2011-08-25 21:03:02 UTC (rev 24964) @@ -11,8 +11,8 @@ # 5. ./publish export TORGIT=/home/runa/tordev/tor/.git -export STABLETAG=tor-0.2.2.30-rc -export DEVTAG=tor-0.2.2.30-rc +export STABLETAG=tor-0.2.2.31-rc +export DEVTAG=tor-0.2.2.31-rc WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton

1 0

[tor/master] manually forward-port 2871dd8bef
by arma＠torproject.org 25 Aug '11

25 Aug '11

commit 870c55b6fd41d200ced1e5ef0367052568fbd2e5 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Aug 25 15:51:24 2011 -0400 manually forward-port 2871dd8bef --- ChangeLog | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 36ebece..91796d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -856,7 +856,7 @@ Changes in version 0.2.2.24-alpha - 2011-04-08 - Directory authorities now log the source of a rejected POSTed v3 networkstatus vote. - Make compilation with clang possible when using - --enable-gcc-warnings by removing two warning optionss that clang + --enable-gcc-warnings by removing two warning options that clang hasn't implemented yet and by fixing a few warnings. Implements ticket 2696. - When expiring circuits, use microsecond timers rather than @@ -1966,9 +1966,10 @@ Changes in version 0.2.2.14-alpha - 2010-07-12 o Minor features: - New config option "WarnUnsafeSocks 0" disables the warning that - occurs whenever Tor receives only an IP address instead of a - hostname. Setups that do DNS locally over Tor are fine, and we - shouldn't spam the logs in that case. + occurs whenever Tor receives a socks handshake using a version of + the socks protocol that can only provide an IP address (rather + than a hostname). Setups that do DNS locally over Tor are fine, + and we shouldn't spam the logs in that case. - Convert the HACKING file to asciidoc, and add a few new sections to it, explaining how we use Git, how we make changelogs, and what should go in a patch. @@ -2902,8 +2903,8 @@ Changes in version 0.2.2.1-alpha - 2009-08-26 oldest-bug prize. o New options for gathering stats safely: - - Directories that set "DirReqStatistics 1" write statistics on - directory request to disk every 24 hours. As compared to the + - Directory mirrors that set "DirReqStatistics 1" write statistics + about directory requests to disk every 24 hours. As compared to the --enable-geoip-stats flag in 0.2.1.x, there are a few improvements: 1) stats are written to disk exactly every 24 hours; 2) estimated shares of v2 and v3 requests are determined as mean values, not at @@ -2941,9 +2942,9 @@ Changes in version 0.2.2.1-alpha - 2009-08-26 the git commit (when we're building from a git checkout). o Minor bugfixes: - - If any the v3 certs we download are unparseable, we should actually - notice the failure so we don't retry indefinitely. Bugfix on - 0.2.0.x; reported by "rotator". + - If any of the v3 certs we download are unparseable, we should + actually notice the failure so we don't retry indefinitely. Bugfix + on 0.2.0.x; reported by "rotator". - If the cached cert file is unparseable, warn but don't exit. - Fix possible segmentation fault on directory authorities. Bugfix on 0.2.1.14-rc.

1 0

[tor/release-0.2.2] go back in time and clean up some changelog entries
by arma＠torproject.org 25 Aug '11

25 Aug '11

commit 2871dd8befc3461d64775ebc3aec29c86767f443 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Aug 25 15:49:41 2011 -0400 go back in time and clean up some changelog entries --- ChangeLog | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index c2a1d24..99a4259 100644 --- a/ChangeLog +++ b/ChangeLog @@ -630,7 +630,7 @@ Changes in version 0.2.2.24-alpha - 2011-04-08 - Directory authorities now log the source of a rejected POSTed v3 networkstatus vote. - Make compilation with clang possible when using - --enable-gcc-warnings by removing two warning optionss that clang + --enable-gcc-warnings by removing two warning options that clang hasn't implemented yet and by fixing a few warnings. Implements ticket 2696. - When expiring circuits, use microsecond timers rather than @@ -1740,9 +1740,10 @@ Changes in version 0.2.2.14-alpha - 2010-07-12 o Minor features: - New config option "WarnUnsafeSocks 0" disables the warning that - occurs whenever Tor receives only an IP address instead of a - hostname. Setups that do DNS locally over Tor are fine, and we - shouldn't spam the logs in that case. + occurs whenever Tor receives a socks handshake using a version of + the socks protocol that can only provide an IP address (rather + than a hostname). Setups that do DNS locally over Tor are fine, + and we shouldn't spam the logs in that case. - Convert the HACKING file to asciidoc, and add a few new sections to it, explaining how we use Git, how we make changelogs, and what should go in a patch. @@ -2675,8 +2676,8 @@ Changes in version 0.2.2.1-alpha - 2009-08-26 oldest-bug prize. o New options for gathering stats safely: - - Directories that set "DirReqStatistics 1" write statistics on - directory request to disk every 24 hours. As compared to the + - Directory mirrors that set "DirReqStatistics 1" write statistics + about directory requests to disk every 24 hours. As compared to the --enable-geoip-stats flag in 0.2.1.x, there are a few improvements: 1) stats are written to disk exactly every 24 hours; 2) estimated shares of v2 and v3 requests are determined as mean values, not at @@ -2714,9 +2715,9 @@ Changes in version 0.2.2.1-alpha - 2009-08-26 the git commit (when we're building from a git checkout). o Minor bugfixes: - - If any the v3 certs we download are unparseable, we should actually - notice the failure so we don't retry indefinitely. Bugfix on - 0.2.0.x; reported by "rotator". + - If any of the v3 certs we download are unparseable, we should + actually notice the failure so we don't retry indefinitely. Bugfix + on 0.2.0.x; reported by "rotator". - If the cached cert file is unparseable, warn but don't exit. - Fix possible segmentation fault on directory authorities. Bugfix on 0.2.1.14-rc.

1 0

[torouter/master] This README is updated
by ioerror＠torproject.org 25 Aug '11

25 Aug '11

commit 6657b82c3eec9026967c98961f30a0e946ba5ec9 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Aug 25 21:23:27 2011 +0200 This README is updated --- freedom-maker/README | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/freedom-maker/README b/freedom-maker/README index 215f56e..15a1c50 100644 --- a/freedom-maker/README +++ b/freedom-maker/README @@ -8,8 +8,8 @@ To build for a DreamPlug, use sudo ./mk_dreamplug_rootfs This will yield a file tree under build/dreamplug, representing the -contents of a root file system. Get that onto a USB stick with something -like +contents of a root file system. Get that onto a USB stick with a Linux +friendly file system (ext3 and not vfat) with something like sudo mount /dev/sdc1 /media/freedom sudo rsync -atvz --progress build/dreamplug/ /media/freedom/ @@ -19,11 +19,15 @@ Move the USB stick to the DreamPlug, and arrange to boot the existing kernel from internal microSD pointing to our new root filesystem by interrupting the boot to talk to U-Boot: + screen /dev/ttyUSB0 115200 +# Reboot the DreamPlug +# You should see "Hit any key to stop autoboot: " - hit a key, any key setenv x_bootargs_root root=/dev/sdc1 rootdelay=10 saveenv reset -The system should boot to a login prompt. +The system should boot to a login prompt and the default password is +'freedom' for the root user. - - - - - @@ -32,6 +36,16 @@ you're logged into the system booted from root on USB stick you can use: sh /boot/copy2dream.sh +If you choose to to reflash the device entirely you'll want to do the +following to switch the root filesystem back to the internal microSD card: + + screen /dev/ttyUSB0 115200 +# Reboot the DreamPlug +# You should see "Hit any key to stop autoboot: " - hit a key, any key + setenv x_bootargs_root root=/dev/sda2 rootdelay=10 + saveenv + reset + - - - - - Be aware that this is an imcomplete solution for now .. you will want to at

1 0

[arm/master] Skeleton terminal contorl interpretor
by atagar＠torproject.org 25 Aug '11

25 Aug '11

commit ba49077b953265515aef1b2b98b159636f37d7c5 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Aug 25 10:15:24 2011 -0700 Skeleton terminal contorl interpretor This provides a basic skeleton for a terminal-only interpretor of the control port. This provides terminal coloring, formatting, and history scollback but it not yet tied into the control port. The plan is that both the torInterpretor and interpretorPanel will use the same backend for irc style interpretor commands so people can use the interpretor in both the curses interface or plain terminal. --- src/util/torInterpretor.py | 66 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 0 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py new file mode 100644 index 0000000..9b6bff4 --- /dev/null +++ b/src/util/torInterpretor.py @@ -0,0 +1,66 @@ +""" +Provides an interactive interpretor for working with the Tor control port. This +adds usability features like IRC style interpretor commands and, when ran +directly, history and tab completion. +""" + +import readline # simply importing this provides history to raw_input + +from util import enum + +TERM_COLORS = ("BLACK", "RED", "GREEN", "YELLOW", "BLUE", "MAGENTA", "CYAN", "WHITE") + +Color = enum.Enum(*TERM_COLORS) +BgColor = enum.Enum(*["BG_" + color for color in TERM_COLORS]) +Attr = enum.Enum("BOLD", "UNDERLINE", "HILIGHT") + +FG_ENCODING = dict([(Color.values()[i], str(30 + i)) for i in range(8)]) +BG_ENCODING = dict([(BgColor.values()[i], str(40 + i)) for i in range(8)]) +ATTR_ENCODING = {Attr.BOLD: "1", Attr.UNDERLINE: "4", Attr.HILIGHT: "7"} + +CSI = "\x1B[%sm" +RESET = CSI % "0" + +def format(msg, *attr): + """ + Simple terminal text formatting, using ANSI escape sequences from: + https://secure.wikimedia.org/wikipedia/en/wiki/ANSI_escape_code#CSI_codes + + toolkits providing similar capabilities: + * django.utils.termcolors + https://code.djangoproject.com/browser/django/trunk/django/utils/termcolors… + + * termcolor + http://pypi.python.org/pypi/termcolor + + * colorama + http://pypi.python.org/pypi/colorama + + Arguments: + msg - string to be formatted + attr - text attributes, this can be Color, BgColor, or Attr enums and are + case insensitive (so strings like "red" are fine) + """ + + encodings = [] + for textAttr in attr: + textAttr, encoding = enum.toCamelCase(textAttr), None + encoding = FG_ENCODING.get(textAttr, encoding) + encoding = BG_ENCODING.get(textAttr, encoding) + encoding = ATTR_ENCODING.get(textAttr, encoding) + if encoding: encodings.append(encoding) + + if encodings: + return (CSI % ";".join(encodings)) + msg + RESET + else: + raise IOError("BLARG! %s" % str(attr)) + return msg + +def prompt(): + prompt = format(">>> ", Color.GREEN, Attr.BOLD) + input = "" + + while input != "/quit": + input = raw_input(prompt) + print format("echoing back '%s'" % input, Color.BLUE) +

1 0

r24963: {website} make a farsi exception as well. (website/trunk)
by Andrew Lewman 25 Aug '11

25 Aug '11

Author: phobos Date: 2011-08-25 16:50:25 +0000 (Thu, 25 Aug 2011) New Revision: 24963 Modified: website/trunk/po2wml.sh Log: make a farsi exception as well. Modified: website/trunk/po2wml.sh =================================================================== --- website/trunk/po2wml.sh 2011-08-23 12:15:54 UTC (rev 24962) +++ website/trunk/po2wml.sh 2011-08-25 16:50:25 UTC (rev 24963) @@ -212,6 +212,36 @@ echo '#include "ar/foot.wmi"' >> "$wmldir/$subdir/$wmlfile" fi + # If the translation is Farsi, include the + # correct header, css, menu files and footer + if [ $subdir = "fa" ] + then + # Head + orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$wmlfile"` + temp_head=`echo $orig_head | sed s@head.wmi@fa/head.wmi@` + new_head=`echo $temp_head 'STYLESHEET="css/master-rtl.css"'` + sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$wmlfile" + + # Side (not all files include this) + orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$wmlfile"` + if [ -n "$orig_side" ] + then + new_side=`echo '#include "fa/side.wmi"'` + sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$wmlfile" + fi + + # Info (not all files include this) + orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$wmlfile"` + if [ -n "$orig_info" ] + then + new_info=`echo '#include "fa/info.wmi"'` + sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$wmlfile" + fi + + # Footer + echo '#include "fa/foot.wmi"' >> "$wmldir/$subdir/$wmlfile" + fi + # If the directory does not include sidenav.wmi, # copy it from the English directory (only if # the English directory has this file)

1 0

[metrics-web/master] Tweak list of country names.
by karsten＠torproject.org 25 Aug '11

25 Aug '11

commit f81633a22621f6a0c4a53468975edc1eeb62b4fc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 25 13:06:57 2011 +0200 Tweak list of country names. --- rserve/graphs.R | 2 +- src/org/torproject/ernie/web/Countries.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index c6ba4fd..ffdbdd6 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -134,7 +134,7 @@ countrylist <- list( "lt" = "Lithuania", "lu" = "Luxembourg", "lv" = "Latvia", - "ly" = "Libyan Arab Jamahiriya", + "ly" = "Libya", "ma" = "Morocco", "mc" = "Monaco", "md" = "the Republic of Moldova", diff --git a/src/org/torproject/ernie/web/Countries.java b/src/org/torproject/ernie/web/Countries.java index 6829488..7149cfb 100644 --- a/src/org/torproject/ernie/web/Countries.java +++ b/src/org/torproject/ernie/web/Countries.java @@ -52,6 +52,7 @@ public class Countries { this.knownCountries.add("bn;Brunei Darussalam".split(";")); this.knownCountries.add("bg;Bulgaria".split(";")); this.knownCountries.add("bf;Burkina Faso".split(";")); + this.knownCountries.add("mm;Burma".split(";")); this.knownCountries.add("bi;Burundi".split(";")); this.knownCountries.add("kh;Cambodia".split(";")); this.knownCountries.add("cm;Cameroon".split(";")); @@ -147,7 +148,7 @@ public class Countries { this.knownCountries.add("lb;Lebanon".split(";")); this.knownCountries.add("ls;Lesotho".split(";")); this.knownCountries.add("lr;Liberia".split(";")); - this.knownCountries.add("ly;Libyan Arab Jamahiriya".split(";")); + this.knownCountries.add("ly;Libya".split(";")); this.knownCountries.add("li;Liechtenstein".split(";")); this.knownCountries.add("lt;Lithuania".split(";")); this.knownCountries.add("lu;Luxembourg".split(";"));

1 0

[metrics-web/master] Update path to direct-users-ranges.csv.
by karsten＠torproject.org 25 Aug '11

25 Aug '11

commit e51b410bd27837afc7b86734a1e7b0fbd805fa7d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 25 13:09:54 2011 +0200 Update path to direct-users-ranges.csv. --- rserve/graphs.R | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index ffdbdd6..d1356b4 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -633,8 +633,8 @@ plot_direct_users <- function(start, end, country, events, path, dpi) { plot <- ggplot(u, aes(x = as.Date(date, "%Y-%m-%d"), y = users)) if (events == "on" & country != "all") { r <- read.csv( - "/srv/metrics.torproject.org/web/direct-users-ranges.csv", - stringsAsFactors = FALSE) + "/srv/metrics.torproject.org/web/detector/direct-users-ranges.csv", + stringsAsFactors = FALSE) r <- r[r$date >= start & r$date <= end & r$country == country, c("date", "minusers", "maxusers")] r <- cast(rbind(melt(u, id.vars = "date"), melt(r, id.vars = "date")))

1 0

[torouter/master] we want to install this directly so that autoclean doesn't kill it
by ioerror＠torproject.org 25 Aug '11

25 Aug '11

commit 12658f7719b46d6e2dfbf778ca5877d384a5fdd6 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Aug 25 02:08:13 2011 +0200 we want to install this directly so that autoclean doesn't kill it --- packages/torouter-prep/src/torouter_config.sh | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh index e5a3391..8449eec 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -80,6 +80,9 @@ apt-get -y install ttdnsd # Install a normal dns cache for eth1 apt-get -y install dnsmasq +# install the best dhcp client we're gonna get in debian land +apt-get -y install isc-dhcp-client + ## ## Configuration stage of the script ##

1 0