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

[translation/gettor] Update translations for gettor
by translation＠torproject.org 20 Feb '13

20 Feb '13

commit b8052bd93e38d138fd3661ea8152f31352288f40 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 20 21:45:05 2013 +0000 Update translations for gettor --- fa/gettor.po | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fa/gettor.po b/fa/gettor.po index 25b9767..01e7fde 100644 --- a/fa/gettor.po +++ b/fa/gettor.po @@ -4,6 +4,7 @@ # # Translators: # <behravanhamed(a)gmail.com>, 2011. +# <hamahangi(a)posteo.eu>, 2013. # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. # martin luther king <sabztunnel(a)gmail.com>, 2011, 2012. msgid "" @@ -11,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-01-19 12:48+0000\n" -"Last-Translator: martin luther king <sabztunnel(a)gmail.com>\n" +"PO-Revision-Date: 2013-02-20 21:44+0000\n" +"Last-Translator: zendegi <hamahangi(a)posteo.eu>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 20 Feb '13

20 Feb '13

commit 29459a62048f49711dae4661fff03670f030b457 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 20 21:16:55 2013 +0000 Update translations for tails-greeter --- fa/fa.po | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/fa/fa.po b/fa/fa.po index 4c44b30..4844647 100644 --- a/fa/fa.po +++ b/fa/fa.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-06-01 15:10+0200\n" -"PO-Revision-Date: 2013-02-20 20:44+0000\n" +"PO-Revision-Date: 2013-02-20 21:03+0000\n" "Last-Translator: zendegi <hamahangi(a)posteo.eu>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -29,36 +29,36 @@ msgstr "به «تيلز» خوش آمديد" #: ../glade/persistencewindow.glade.h:3 msgid "Use persistence?" -msgstr "" +msgstr "تداوم داده‌ها بكار بردن؟" #: ../glade/persistencewindow.glade.h:4 msgid "Yes" -msgstr "" +msgstr "بلى" #: ../glade/persistencewindow.glade.h:5 msgid "No" -msgstr "" +msgstr "نه" #: ../glade/persistencewindow.glade.h:6 msgid "Passphrase:" -msgstr "" +msgstr "عبارت عبور" #: ../glade/persistencewindow.glade.h:7 msgid "Read-Only?" -msgstr "" +msgstr "فقط خواندنى؟" #: ../glade/persistencewindow.glade.h:8 ../glade/optionswindow.glade.h:8 #: ../glade/langpanel.glade.h:1 msgid " " -msgstr "" +msgstr " " #: ../glade/persistencewindow.glade.h:9 msgid "More options?" -msgstr "" +msgstr "خيارات بيشتر" #: ../glade/optionswindow.glade.h:3 msgid "Administration password" -msgstr "" +msgstr "رمز عبور اداره" #: ../glade/optionswindow.glade.h:4 msgid "" @@ -68,11 +68,11 @@ msgstr "" #: ../glade/optionswindow.glade.h:6 msgid "Password:" -msgstr "" +msgstr "رمز عبور" #: ../glade/optionswindow.glade.h:7 msgid "Verify Password:" -msgstr "" +msgstr "بازبينى‌كردن رمز عبور" #: ../glade/optionswindow.glade.h:9 msgid "Windows Camouflage" @@ -90,15 +90,15 @@ msgstr "" #: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 msgid "Language" -msgstr "" +msgstr "زبان" #: ../glade/langpanel.glade.h:3 msgid "Locale" -msgstr "" +msgstr "محل" #: ../glade/langpanel.glade.h:4 msgid "Layout" -msgstr "" +msgstr "طرح" #: ../GdmGreeter/optionswindow.py:68 msgid "Passwords do not match" @@ -134,4 +134,4 @@ msgstr "" #: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 #: ../GdmGreeter/langpanel.py:181 msgid "Other..." -msgstr "" +msgstr "فقط خواندنى؟"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 20 Feb '13

20 Feb '13

commit aed7150873484e8ca279a770866b16305f8d425b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 20 20:46:35 2013 +0000 Update translations for tails-greeter --- fa/fa.po | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 137 insertions(+), 0 deletions(-) diff --git a/fa/fa.po b/fa/fa.po new file mode 100644 index 0000000..4c44b30 --- /dev/null +++ b/fa/fa.po @@ -0,0 +1,137 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <hamahangi(a)posteo.eu>, 2013. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-06-01 15:10+0200\n" +"PO-Revision-Date: 2013-02-20 20:44+0000\n" +"Last-Translator: zendegi <hamahangi(a)posteo.eu>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fa\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../glade/persistencewindow.glade.h:1 ../glade/optionswindow.glade.h:1 +#: ../GdmGreeter/persistencewindow.py:128 +msgid "Login" +msgstr "ثبت ورود" + +#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:2 +msgid "Welcome to Tails" +msgstr "به «تيلز» خوش آمديد" + +#: ../glade/persistencewindow.glade.h:3 +msgid "Use persistence?" +msgstr "" + +#: ../glade/persistencewindow.glade.h:4 +msgid "Yes" +msgstr "" + +#: ../glade/persistencewindow.glade.h:5 +msgid "No" +msgstr "" + +#: ../glade/persistencewindow.glade.h:6 +msgid "Passphrase:" +msgstr "" + +#: ../glade/persistencewindow.glade.h:7 +msgid "Read-Only?" +msgstr "" + +#: ../glade/persistencewindow.glade.h:8 ../glade/optionswindow.glade.h:8 +#: ../glade/langpanel.glade.h:1 +msgid " " +msgstr "" + +#: ../glade/persistencewindow.glade.h:9 +msgid "More options?" +msgstr "" + +#: ../glade/optionswindow.glade.h:3 +msgid "Administration password" +msgstr "" + +#: ../glade/optionswindow.glade.h:4 +msgid "" +"Enter an administration password in case you need to perform administration tasks.\n" +"Otherwise it will be disabled for better security." +msgstr "" + +#: ../glade/optionswindow.glade.h:6 +msgid "Password:" +msgstr "" + +#: ../glade/optionswindow.glade.h:7 +msgid "Verify Password:" +msgstr "" + +#: ../glade/optionswindow.glade.h:9 +msgid "Windows Camouflage" +msgstr "" + +#: ../glade/optionswindow.glade.h:10 +msgid "" +"This option makes Tails look more like Microsoft Windows XP. This may be " +"useful in public places in order to avoid attracting suspicion." +msgstr "" + +#: ../glade/optionswindow.glade.h:11 +msgid "Activate Microsoft Windows XP Camouflage" +msgstr "" + +#: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 +msgid "Language" +msgstr "" + +#: ../glade/langpanel.glade.h:3 +msgid "Locale" +msgstr "" + +#: ../glade/langpanel.glade.h:4 +msgid "Layout" +msgstr "" + +#: ../GdmGreeter/optionswindow.py:68 +msgid "Passwords do not match" +msgstr "" + +#: ../GdmGreeter/persistence.py:59 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stderr)s" +msgstr "" + +#: ../GdmGreeter/persistence.py:99 +#, python-format +msgid "" +"cryptsetup failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "" + +#: ../GdmGreeter/persistence.py:124 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "" + +#: ../GdmGreeter/persistencewindow.py:94 +msgid "Wrong passphrase. Please try again." +msgstr "" + +#: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 +#: ../GdmGreeter/langpanel.py:181 +msgid "Other..." +msgstr ""

1 0

[translation/tsum_completed] Update translations for tsum_completed
by translation＠torproject.org 20 Feb '13

20 Feb '13

commit 463183bb686de57ecba05f2e5a8f70f2f944be02 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 20 19:45:21 2013 +0000 Update translations for tsum_completed --- zh_CN/short-user-manual_zh_CN_noimg.xhtml | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/zh_CN/short-user-manual_zh_CN_noimg.xhtml b/zh_CN/short-user-manual_zh_CN_noimg.xhtml index e62098c..1bcd132 100644 --- a/zh_CN/short-user-manual_zh_CN_noimg.xhtml +++ b/zh_CN/short-user-manual_zh_CN_noimg.xhtml @@ -22,12 +22,12 @@ 注意：Linux 和 Mac OS X 的 Tor 浏览器软件包相当大，你无法通过 Gmail、Hotmail 或者雅虎邮箱获取这些软件包。如果你无法获取你想要的软件包，请发送邮件至 help(a)rt.torproject.org ，我们会给提供你一份网站镜像列表。 <h3 id="tor-for-smartphones">智能手机版的 Tor</h3> 你可以通过安装 Orbot 软件包以在你的 Android 设备上获取 Tor 。关于如何下载和安装 Orbot，请参看 <a href="https://www.torproject.org/docs/android.html.en">Tor Project 网站</a>。 - 我们还有为 <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> 和 <a href="http://sid77.slackware.it/ios/">Apple iOS</a> 制作的实验性软件包。 + 另外，还提供用于 <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> 和 <a href="http://sid77.slackware.it/iphone/">Apple iOS</a> 的试验包。 <h3 id="how-to-verify-that-you-have-the-right-version">如何验证你已拥有正确的版本</h3> 在运行 Tor 浏览器软件包之前，你应该确保你持有正确的版本。 你将获取到的，还有一个与软件包的文件名相同、扩展名为 .asc 的文件。这个 .asc 文件是一个 GPG 签名，它能让你校验所下载到的文件是否与你想要下载的完全一致。 在校验签名之前，你将需要下载并安装 GnuPG： - Windows: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a> Mac OS X: <a href="http://www.gpgtools.org/">http://www.gpgtools.org/</a> Linux: 多数 Linux 发行版预装有 GnuPG 程序。 + Windows: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a> Mac OS X: <a href="http://macgpg.sourceforge.net/">http://macgpg.sourceforge.net/</a> Linux: 多数 Linux 发行版预装有 GnuPG 程序。 请注意，你可能需要修改下面所用到的路径和命令，让它们能在你的系统上生效。 Tor 浏览器软件由 Erinn Clark 使用密钥 0x63FEE659 签署。要导入 Erinn 的密钥，请执行： <pre> @@ -45,6 +45,7 @@ Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659 uid Erinn Clark <erinn(a)torproject.org> uid Erinn Clark <erinn(a)debian.org> + uid Erinn Clark <erinn(a)double-helix.org> sub 2048R/EB399FD7 2003-10-16 </code> @@ -57,7 +58,7 @@ sub 2048R/EB399FD7 2003-10-16 输出的结果应为 &quot;Good signature&quot;。若是 Bad signature 则意味着该文件被篡改过。如果你看见一个坏的签名，请把你在哪里下载到该软件包、你验证签名的过程、以及 GunPG 的输出结果一并以电子邮件发送到 help(a)rt.torproject.org. 当你已完成校验并看到 &quot;Good signature&quot; 的输出结果，请把软件包解压缩。然后你应该会看到一个类似 tor-browser_en-US 这样的文件夹。此文件夹里有另一个名为 Docs 的文件夹，内含一个 changelog 文件。请确保 changelog 里第一行的版本号与文件名中的版本号相符。 <h3 id="how-to-use-the-tor-browser-bundle">如何使用 Tor 浏览器软件包</h3> - 下载 Tor Browser Bundle 后，将软件包解压到您的桌面或U盘里。您会得到一个文件夹，其中含有一个名为"Start Tor Browser"的应用程序(或"start-tor-browser"，具体取决与您的操作系统) + 下载 Tor Browser Bundle 并提取文件之后，将会出现一个包含几个文件的文件夹。其中包含一个可执行文件，文件名为“Start Tor Browser“（或”start-tor-browser“，这取决于你的操作系统）。 当你运行 Tor 浏览器软件包，你会首先看到 Vidalia 启动并把你接入到 Tor 网络。之后你会看到一个浏览器打开了 <a href="https://check.torproject.org/">https://check.torproject.org/</a>，确认你正在使用 Tor。现在你可以开始通过 Tor 来浏览互联网了。 请注意，你必须使用软件包里的浏览器，而不是你自己的浏览器。这点至关重要。

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 20 Feb '13

20 Feb '13

commit e951c45ba8160486248893764dc365f15238a9e0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 20 19:45:16 2013 +0000 Update translations for tsum --- zh_CN/short-user-manual_zh_CN_noimg.xhtml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/short-user-manual_zh_CN_noimg.xhtml b/zh_CN/short-user-manual_zh_CN_noimg.xhtml index 7cd112a..1bcd132 100644 --- a/zh_CN/short-user-manual_zh_CN_noimg.xhtml +++ b/zh_CN/short-user-manual_zh_CN_noimg.xhtml @@ -22,7 +22,7 @@ 注意：Linux 和 Mac OS X 的 Tor 浏览器软件包相当大，你无法通过 Gmail、Hotmail 或者雅虎邮箱获取这些软件包。如果你无法获取你想要的软件包，请发送邮件至 help(a)rt.torproject.org ，我们会给提供你一份网站镜像列表。 <h3 id="tor-for-smartphones">智能手机版的 Tor</h3> 你可以通过安装 Orbot 软件包以在你的 Android 设备上获取 Tor 。关于如何下载和安装 Orbot，请参看 <a href="https://www.torproject.org/docs/android.html.en">Tor Project 网站</a>。 - We also have experimental packages for <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> and <a href="http://sid77.slackware.it/iphone/">Apple iOS</a>. + 另外，还提供用于 <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> 和 <a href="http://sid77.slackware.it/iphone/">Apple iOS</a> 的试验包。 <h3 id="how-to-verify-that-you-have-the-right-version">如何验证你已拥有正确的版本</h3> 在运行 Tor 浏览器软件包之前，你应该确保你持有正确的版本。 你将获取到的，还有一个与软件包的文件名相同、扩展名为 .asc 的文件。这个 .asc 文件是一个 GPG 签名，它能让你校验所下载到的文件是否与你想要下载的完全一致。 @@ -58,7 +58,7 @@ sub 2048R/EB399FD7 2003-10-16 输出的结果应为 &quot;Good signature&quot;。若是 Bad signature 则意味着该文件被篡改过。如果你看见一个坏的签名，请把你在哪里下载到该软件包、你验证签名的过程、以及 GunPG 的输出结果一并以电子邮件发送到 help(a)rt.torproject.org. 当你已完成校验并看到 &quot;Good signature&quot; 的输出结果，请把软件包解压缩。然后你应该会看到一个类似 tor-browser_en-US 这样的文件夹。此文件夹里有另一个名为 Docs 的文件夹，内含一个 changelog 文件。请确保 changelog 里第一行的版本号与文件名中的版本号相符。 <h3 id="how-to-use-the-tor-browser-bundle">如何使用 Tor 浏览器软件包</h3> - After downloading the Tor Browser Bundle and extracting the package, you should have a directory with a few files in it. One of the files is an executable called "Start Tor Browser" (or "start-tor-browser", depending on your operating system). + 下载 Tor Browser Bundle 并提取文件之后，将会出现一个包含几个文件的文件夹。其中包含一个可执行文件，文件名为“Start Tor Browser“（或”start-tor-browser“，这取决于你的操作系统）。 当你运行 Tor 浏览器软件包，你会首先看到 Vidalia 启动并把你接入到 Tor 网络。之后你会看到一个浏览器打开了 <a href="https://check.torproject.org/">https://check.torproject.org/</a>，确认你正在使用 Tor。现在你可以开始通过 Tor 来浏览互联网了。 请注意，你必须使用软件包里的浏览器，而不是你自己的浏览器。这点至关重要。

1 0

[flashproxy/master] Extract client requests for graphing with R.
by dcf＠torproject.org 20 Feb '13

20 Feb '13

commit eea5ed742bcc4399f7262aeea9ba7db94da7fded Author: David Fifield <david(a)bamsoftware.com> Date: Wed Feb 20 04:07:31 2013 -0800 Extract client requests for graphing with R. --- experiments/client-extract.py | 50 +++++++++++++++++++++++++++++++++++++++++ experiments/client-graph.r | 5 ++++ 2 files changed, 55 insertions(+), 0 deletions(-) diff --git a/experiments/client-extract.py b/experiments/client-extract.py new file mode 100755 index 0000000..4df242c --- /dev/null +++ b/experiments/client-extract.py @@ -0,0 +1,50 @@ +#!/usr/bin/env python + +import datetime +import getopt +import re +import sys + +def usage(f = sys.stdout): + print >> f, """\ +Usage: %s [INPUTFILE] +Extract client connections from a facilitator log. Each output line is + date\tcount\n +where count is the number of client requests in that hour. + + -h, --help show this help. +""" % sys.argv[0] + +opts, args = getopt.gnu_getopt(sys.argv[1:], "h", ["help"]) +for o, a in opts: + if o == "-h" or o == "--help": + usage() + sys.exit() + +if len(args) == 0: + input_file = sys.stdin +elif len(args) == 1: + input_file = open(args[0]) +else: + usage() + sys.exit() + +prev_output = None +count = 0.0 + +for line in input_file: + m = re.match(r'^(\d+-\d+-\d+ \d+:\d+:\d+) client', line) + if not m: + continue + date_str, = m.groups() + date = datetime.datetime.strptime(date_str, "%Y-%m-%d %H:%M:%S") + + count += 1 + + rounded_date = date.replace(minute=0, second=0, microsecond=0) + prev_output = prev_output or rounded_date + if prev_output is None or rounded_date != prev_output: + avg = float(count) + print date.strftime("%Y-%m-%d %H:%M:%S") + "\t" + "%.2f" % avg + prev_output = rounded_date + count = 0.0 diff --git a/experiments/client-graph.r b/experiments/client-graph.r new file mode 100644 index 0000000..a17647f --- /dev/null +++ b/experiments/client-graph.r @@ -0,0 +1,5 @@ +library(ggplot2) +x <- read.delim("client.dat", header=FALSE, col.names=c("date", "count"), colClasses=c("POSIXct", "numeric")) + +png("client-count.png", width=720, height=480) +qplot(date, data=x, geom="bar", weight=count, binwidth=86400, ylab="client requests per day")

1 0

[flashproxy/master] Extract proxy requests for graphing with R.
by dcf＠torproject.org 20 Feb '13

20 Feb '13

commit 5713db780884c581f53a8045b370fa32b4a7b5ec Author: David Fifield <david(a)bamsoftware.com> Date: Wed Feb 20 03:57:48 2013 -0800 Extract proxy requests for graphing with R. --- experiments/proxy-extract.py | 82 ++++++++++++++++++++++++++++++++++++++++++ experiments/proxy-graph.r | 5 +++ 2 files changed, 87 insertions(+), 0 deletions(-) diff --git a/experiments/proxy-extract.py b/experiments/proxy-extract.py new file mode 100755 index 0000000..e8b02ce --- /dev/null +++ b/experiments/proxy-extract.py @@ -0,0 +1,82 @@ +#!/usr/bin/env python + +import datetime +import getopt +import re +import sys + +def usage(f = sys.stdout): + print >> f, """\ +Usage: %s [INPUTFILE] +Extract proxy connections from a facilitator log. Each output line is + date\tcount\n +where count is the approximate poll interval in effect at date. + + -h, --help show this help. +""" % sys.argv[0] + +opts, args = getopt.gnu_getopt(sys.argv[1:], "h", ["help"]) +for o, a in opts: + if o == "-h" or o == "--help": + usage() + sys.exit() + +if len(args) == 0: + input_file = sys.stdin +elif len(args) == 1: + input_file = open(args[0]) +else: + usage() + sys.exit() + +def timedelta_to_seconds(delta): + return delta.days * (24 * 60 * 60) + delta.seconds + delta.microseconds / 1000000.0 + +# commit 49de7bf689ee989997a1edbf2414a7bdbc2164f9 +# Author: David Fifield <david(a)bamsoftware.com> +# Date: Thu Jan 3 21:01:39 2013 -0800 +# +# Bump poll interval from 10 s to 60 s. +# +# commit 69d429db12cedc90dac9ccefcace80c86af7eb51 +# Author: David Fifield <david(a)bamsoftware.com> +# Date: Tue Jan 15 14:02:02 2013 -0800 +# +# Increase facilitator_poll_interval from 1 m to 10 m. + +BEGIN_60S = datetime.datetime(2013, 1, 3, 21, 0, 0) +BEGIN_600S = datetime.datetime(2013, 1, 15, 14, 0, 0) + +# Proxies refresh themselves once a day, so interpolate across a day when the +# polling interval historically changed. +def get_poll_interval(date): + if date < BEGIN_60S: + return 10 + elif BEGIN_60S <= date < BEGIN_60S + datetime.timedelta(1): + return timedelta_to_seconds(date-BEGIN_60S) / timedelta_to_seconds(datetime.timedelta(1)) * (60-10) + 10 + elif date < BEGIN_600S: + return 60 + elif BEGIN_600S <= date < BEGIN_600S + datetime.timedelta(1): + return timedelta_to_seconds(date-BEGIN_600S) / timedelta_to_seconds(datetime.timedelta(1)) * (600-60) + 60 + else: + return 600 + +prev_output = None +count = 0.0 + +for line in input_file: + m = re.match(r'^(\d+-\d+-\d+ \d+:\d+:\d+) proxy gets', line) + if not m: + continue + date_str, = m.groups() + date = datetime.datetime.strptime(date_str, "%Y-%m-%d %H:%M:%S") + + count += get_poll_interval(date) + + rounded_date = date.replace(minute=0, second=0, microsecond=0) + prev_output = prev_output or rounded_date + if prev_output is None or rounded_date != prev_output: + avg = float(count) / 10.0 + print date.strftime("%Y-%m-%d %H:%M:%S") + "\t" + "%.2f" % avg + prev_output = rounded_date + count = 0.0 diff --git a/experiments/proxy-graph.r b/experiments/proxy-graph.r new file mode 100644 index 0000000..6b3e1cc --- /dev/null +++ b/experiments/proxy-graph.r @@ -0,0 +1,5 @@ +library(ggplot2) +x <- read.delim("proxy.dat", header=FALSE, col.names=c("date", "interval"), colClasses=c("POSIXct", "numeric")) + +png("proxy-count.png", width=720, height=480) +qplot(date, data=x, geom="bar", weight=interval/10, binwidth=86400, ylab="proxy requests per day")

1 0

[stem/master] Change fingerprints and digests to upper-case hex.
by atagar＠torproject.org 20 Feb '13

20 Feb '13

commit be9a5323a37ea0f1b7d497d7fc33e101453eb2cf Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Feb 20 12:26:29 2013 +0100 Change fingerprints and digests to upper-case hex. --- stem/descriptor/extrainfo_descriptor.py | 9 +++++---- stem/descriptor/router_status_entry.py | 6 +++--- stem/descriptor/server_descriptor.py | 6 +++--- test/integ/descriptor/networkstatus.py | 16 ++++++++-------- test/unit/descriptor/router_status_entry.py | 4 ++-- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index cc779b8..dce95a5 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -31,7 +31,7 @@ Extra-info descriptors are available from a few sources... | |- RelayExtraInfoDescriptor - Extra-info descriptor for a relay. | +- BridgeExtraInfoDescriptor - Extra-info descriptor for a bridge. | - |- digest - calculates the digest value for our content + |- digest - calculates the upper-case hex digest value for our content +- get_unrecognized_lines - lines with unrecognized content .. data:: DirResponse (enum) @@ -783,10 +783,11 @@ class ExtraInfoDescriptor(stem.descriptor.Descriptor): def digest(self): """ - Provides the hex encoded sha1 of our content. This value is part of the - server descriptor entry for this relay. + Provides the upper-case hex encoded sha1 of our content. This value is part + of the server descriptor entry for this relay. - :returns: **str** with the digest value for this server descriptor + :returns: **str** with the upper-case hex digest value for this server + descriptor """ raise NotImplementedError("Unsupported Operation: this should be implemented by the ExtraInfoDescriptor subclass") diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index 4bdef70..ca548b1 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -248,7 +248,7 @@ class RouterStatusEntryV2(RouterStatusEntry): Information about an individual router stored within a version 2 network status document. - :var str digest: **\*** router's digest + :var str digest: **\*** router's upper-case hex digest **\*** attribute is either required when we're parsed with validation or has a default value, others are left as **None** if undefined @@ -303,7 +303,7 @@ class RouterStatusEntryV3(RouterStatusEntry): :var list addresses_v6: **\*** relay's OR addresses, this is a tuple listing of the form (address (**str**), port (**int**), is_ipv6 (**bool**)) - :var str digest: **\*** router's digest + :var str digest: **\*** router's upper-case hex digest :var int bandwidth: bandwidth claimed by the relay (in kb/s) :var int measured: bandwidth measured to be available by the relay @@ -500,7 +500,7 @@ def _parse_r_line(desc, value, validate, include_digest = True): desc.fingerprint = _decode_fingerprint(r_comp[1], validate) if include_digest: - desc.digest = r_comp[2] + desc.digest = _decode_fingerprint(r_comp[2], validate) desc.address = r_comp[5] desc.or_port = int(r_comp[6]) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 9cecb23..2db9a49 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -23,7 +23,7 @@ etc). This information is provided from a few sources... | |- is_scrubbed - checks if our content has been properly scrubbed | +- get_scrubbing_issues - description of issues with our scrubbing | - |- digest - calculates the digest value for our content + |- digest - calculates the upper-case hex digest value for our content |- get_unrecognized_lines - lines with unrecognized content |- get_annotations - dictionary of content prior to the descriptor entry +- get_annotation_lines - lines that provided the annotations @@ -170,7 +170,7 @@ class ServerDescriptor(stem.descriptor.Descriptor): :var bool hibernating: **\*** hibernating when published :var bool allow_single_hop_exits: **\*** flag if single hop exiting is allowed :var bool extra_info_cache: **\*** flag if a mirror for extra-info documents - :var str extra_info_digest: hex encoded digest of our extra-info document + :var str extra_info_digest: upper-case hex encoded digest of our extra-info document :var bool eventdns: flag for evdns backend (deprecated, always unset) :var list address_alt: alternative for our address/or_port attributes, each entry is a tuple of the form (address (**str**), port (**int**), is_ipv6 @@ -277,7 +277,7 @@ class ServerDescriptor(stem.descriptor.Descriptor): Provides the hex encoded sha1 of our content. This value is part of the network status entry for this relay. - :returns: **str** with the digest value for this server descriptor + :returns: **str** with the upper-case hex digest value for this server descriptor """ raise NotImplementedError("Unsupported Operation: this should be implemented by the ServerDescriptor subclass") diff --git a/test/integ/descriptor/networkstatus.py b/test/integ/descriptor/networkstatus.py index 9f68eba..6bfd137 100644 --- a/test/integ/descriptor/networkstatus.py +++ b/test/integ/descriptor/networkstatus.py @@ -125,7 +125,7 @@ class TestNetworkStatus(unittest.TestCase): router = next(descriptors) self.assertEquals("sumkledi", router.nickname) self.assertEquals("0013D22389CD50D0B784A3E4061CB31E8CE8CEB5", router.fingerprint) - self.assertEquals("8mCr8Sl7RF4ENU4jb0FZFA/3do8", router.digest) + self.assertEquals("F260ABF1297B445E04354E236F4159140FF7768F", router.digest) self.assertEquals(datetime.datetime(2012, 7, 12, 4, 1, 55), router.published) self.assertEquals("178.218.213.229", router.address) self.assertEquals(80, router.or_port) @@ -142,7 +142,7 @@ class TestNetworkStatus(unittest.TestCase): router = next(stem.descriptor.parse_file(descriptor_file)) self.assertEquals("Unnamed", router.nickname) self.assertEquals("0014A2055278DB3EB0E59EA701741416AF185558", router.fingerprint) - self.assertEquals("FI74aFuNJZZQrgln0f+OaocMd0M", router.digest) + self.assertEquals("148EF8685B8D259650AE0967D1FF8E6A870C7743", router.digest) self.assertEquals(datetime.datetime(2012, 5, 31, 15, 57, 0), router.published) self.assertEquals("10.97.236.247", router.address) self.assertEquals(443, router.or_port) @@ -264,7 +264,7 @@ I/TJmV928na7RLZe2mGHCAW3VQOvV+QkCfj05VZ8CsY= router = document.routers[0] self.assertEquals("sumkledi", router.nickname) self.assertEquals("0013D22389CD50D0B784A3E4061CB31E8CE8CEB5", router.fingerprint) - self.assertEquals("8mCr8Sl7RF4ENU4jb0FZFA/3do8", router.digest) + self.assertEquals("F260ABF1297B445E04354E236F4159140FF7768F", router.digest) self.assertEquals(datetime.datetime(2012, 7, 12, 4, 1, 55), router.published) self.assertEquals("178.218.213.229", router.address) self.assertEquals(80, router.or_port) @@ -339,7 +339,7 @@ TpQQk3nNQF8z6UIvdlvP+DnJV4izWVkQEZgUZgIVM0E= router1 = document.routers[0] self.assertEquals("moria2", router1.nickname) self.assertEquals("719BE45DE224B607C53707D0E2143E2D423E74CF", router1.fingerprint) - self.assertEquals("t/Pwl1uHiJ3RKF/Vehsbthf2VDI", router1.digest) + self.assertEquals("B7F3F0975B87889DD1285FD57A1B1BB617F65432", router1.digest) self.assertEquals(datetime.datetime(2005, 12, 15, 6, 57, 18), router1.published) self.assertEquals("18.244.0.114", router1.address) self.assertEquals(443, router1.or_port) @@ -349,7 +349,7 @@ TpQQk3nNQF8z6UIvdlvP+DnJV4izWVkQEZgUZgIVM0E= router2 = document.routers[1] self.assertEquals("stnv", router2.nickname) self.assertEquals("0928BA467056C4A689FEE4EF5D71482B6289C3D5", router2.fingerprint) - self.assertEquals("ItGn7UGZvaftbEFu7NdpwY4fKlo", router2.digest) + self.assertEquals("22D1A7ED4199BDA7ED6C416EECD769C18E1F2A5A", router2.digest) self.assertEquals(datetime.datetime(2005, 12, 15, 16, 24, 42), router2.published) self.assertEquals("84.16.236.173", router2.address) self.assertEquals(9001, router2.or_port) @@ -359,7 +359,7 @@ TpQQk3nNQF8z6UIvdlvP+DnJV4izWVkQEZgUZgIVM0E= router3 = document.routers[2] self.assertEquals("nggrplz", router3.nickname) self.assertEquals("09E8582FF0E6F85E2B8E41C0DC0B9C9DC46E6968", router3.fingerprint) - self.assertEquals("swLCsByU85jj7ziTlSawZR+CTdY", router3.digest) + self.assertEquals("B302C2B01C94F398E3EF38939526B0651F824DD6", router3.digest) self.assertEquals(datetime.datetime(2005, 12, 15, 23, 25, 50), router3.published) self.assertEquals("194.109.109.109", router3.address) self.assertEquals(9001, router3.or_port) @@ -379,7 +379,7 @@ TpQQk3nNQF8z6UIvdlvP+DnJV4izWVkQEZgUZgIVM0E= router = next(descriptors) self.assertEquals("sumkledi", router.nickname) self.assertEquals("0013D22389CD50D0B784A3E4061CB31E8CE8CEB5", router.fingerprint) - self.assertEquals("B5n4BiALAF8B5AqafxohyYiuj7E", router.digest) + self.assertEquals("0799F806200B005F01E40A9A7F1A21C988AE8FB1", router.digest) self.assertEquals(datetime.datetime(2012, 7, 11, 4, 22, 53), router.published) self.assertEquals("178.218.213.229", router.address) self.assertEquals(80, router.or_port) @@ -462,7 +462,7 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= router = document.routers[0] self.assertEquals("sumkledi", router.nickname) self.assertEquals("0013D22389CD50D0B784A3E4061CB31E8CE8CEB5", router.fingerprint) - self.assertEquals("B5n4BiALAF8B5AqafxohyYiuj7E", router.digest) + self.assertEquals("0799F806200B005F01E40A9A7F1A21C988AE8FB1", router.digest) self.assertEquals(datetime.datetime(2012, 7, 11, 4, 22, 53), router.published) self.assertEquals("178.218.213.229", router.address) self.assertEquals(80, router.or_port) diff --git a/test/unit/descriptor/router_status_entry.py b/test/unit/descriptor/router_status_entry.py index b994f23..d01666b 100644 --- a/test/unit/descriptor/router_status_entry.py +++ b/test/unit/descriptor/router_status_entry.py @@ -50,7 +50,7 @@ class TestRouterStatusEntry(unittest.TestCase): self.assertEqual(None, entry.document) self.assertEqual("caerSidi", entry.nickname) self.assertEqual("A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB", entry.fingerprint) - self.assertEqual("oQZFLYe9e4A7bOkWKR7TaNxb0JE", entry.digest) + self.assertEqual("A106452D87BD7B803B6CE916291ED368DC5BD091", entry.digest) self.assertEqual(datetime.datetime(2012, 8, 6, 11, 19, 31), entry.published) self.assertEqual("71.35.150.29", entry.address) self.assertEqual(9001, entry.or_port) @@ -71,7 +71,7 @@ class TestRouterStatusEntry(unittest.TestCase): self.assertEqual(None, entry.document) self.assertEqual("caerSidi", entry.nickname) self.assertEqual("A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB", entry.fingerprint) - self.assertEqual("oQZFLYe9e4A7bOkWKR7TaNxb0JE", entry.digest) + self.assertEqual("A106452D87BD7B803B6CE916291ED368DC5BD091", entry.digest) self.assertEqual(datetime.datetime(2012, 8, 6, 11, 19, 31), entry.published) self.assertEqual("71.35.150.29", entry.address) self.assertEqual(9001, entry.or_port)

1 0

r26060: {website} new ssl cert fingerprints (website/trunk/docs/en)
by Moritz Bartl 20 Feb '13

20 Feb '13

Author: moritz Date: 2013-02-20 13:56:27 +0000 (Wed, 20 Feb 2013) New Revision: 26060 Modified: website/trunk/docs/en/faq.wml Log: new ssl cert fingerprints Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2013-02-19 11:24:36 UTC (rev 26059) +++ website/trunk/docs/en/faq.wml 2013-02-20 13:56:27 UTC (rev 26060) @@ -760,10 +760,10 @@ <pre> *.torproject.org SSL certificate from Digicert: The serial number is: -02:DA:41:04:89:A5:FD:A2:B5:DB:DB:F8:ED:15:0D:BE - The SHA-1 fingerprint is: a7e70f8a648fe04a9677f13eedf6f91b5f7f2e25 +06:DE:97:E5:1D:C3:9D:C2:64:8D:AC:72:DD:41:01:FC + The SHA-1 fingerprint is: 1f9d306e8bfccfcb03981a71a27a9f5d1e0876ce The SHA-256 fingerprint is: -23b854af6b96co224fd173382c520b46fa94f2d4e7238893f63ad2d783e27b4b +3613d2b22a750094760c41ad19db52a4f05bdea80172e2578761ad967f7ed9aa blog.torproject.org SSL certificate from RapidSSL: The serial number is: 00:EF:A3

1 0

[metrics-web/master] Update sanitized bridge descriptor examples.
by karsten＠torproject.org 20 Feb '13

20 Feb '13

commit 02e57fae5b742d64811eab8baebe9a71e6fbce18 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Feb 20 12:28:12 2013 +0100 Update sanitized bridge descriptor examples. --- web/WEB-INF/formats.jsp | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp index f5514b4..ab13e1b 100644 --- a/web/WEB-INF/formats.jsp +++ b/web/WEB-INF/formats.jsp @@ -383,17 +383,18 @@ For more details about this process, see the <tt>@type bridge-server-descriptor 1.0</tt> -<tt>router Unnamed 10.74.150.129 443 0 0</tt> +<tt>router Hawthorne 10.175.105.22 443 0 0</tt> <tt>platform Tor 0.2.2.19-alpha (git-1988927edecce4c7) on Linux i686</tt> <tt>opt protocols Link 1 2 Circuit 1</tt> <tt>published 2010-12-27 18:55:01</tt> <tt>opt fingerprint A5FA 7F38 B02A 415E 72FE 614C 64A1 E5A9 2BA9 9BBD</tt> <tt>uptime 2347112</tt> <tt>bandwidth 5242880 10485760 1016594</tt> -<tt>opt extra-info-digest 86E6E9E68707AF586FFD09A36FAC236ADA0D11CC</tt> +<tt>opt extra-info-digest E729BCB5E06A5657A73151B55354EB003D2BAE0F</tt> <tt>opt hidden-service-dir</tt> <tt>contact somebody</tt> <tt>reject *:*</tt> +<tt>router-digest 46DFDBE7B67B7C90A1962B0B5AA4526FAF406979</tt> </blockquote> @@ -403,10 +404,10 @@ For more details about this process, see the <tt>@type bridge-network-status 1.0</tt> -<tt>published 2010-12-27 22:03:01</tt> +<tt>published 2010-12-27 22:07:03</tt> <tt>[...status entries...]</tt> -<tt>r Unnamed pfp/OLAqQV5y/mFMZKHlqSupm70 dByzfWWLas9cen7PtZ3XGYIJHt4 - 2010-12-27 18:55:01 10.74.150.129 443 0</tt> +<tt>r Hawthorne pfp/OLAqQV5y/mFMZKHlqSupm70 Rt/b57Z7fJChlisLWqRSb69AaXk + 2010-12-27 18:55:01 10.175.105.22 443 0</tt> <tt>s Fast Guard HSDir Running Stable Valid</tt> <tt>[...status entries...]</tt>

1 0