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

[torbrowser/master] Merge branch 'maint-2.3'
by erinn＠torproject.org 06 Aug '12

06 Aug '12

commit c85e20f2cc40dcc9fdae18c2cf482e575766dd10 Merge: d486476 1e3b8a5 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 6 02:16:43 2012 +0100 Merge branch 'maint-2.3' README.LINUX-2.3 | 2 +- README.OSX-2.3 | 2 +- README.WIN-2.3 | 2 +- build-scripts/linux-alpha.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/versions-alpha.mk | 2 +- build-scripts/windows-alpha.mk | 2 +- … [View More]

1 0

[torbrowser/master] actually, bump alpha bundles to 2.3.20-alpha-1
by erinn＠torproject.org 06 Aug '12

06 Aug '12

commit 1e3b8a5972e4f53f30b6a46eae4282b817b736da Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 6 02:16:18 2012 +0100 actually, bump alpha bundles to 2.3.20-alpha-1 --- README.LINUX-2.3 | 2 +- README.OSX-2.3 | 2 +- README.WIN-2.3 | 2 +- build-scripts/linux-alpha.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/versions-alpha.mk | 2 +- build-scripts/windows-alpha.mk | 2 +- … [View More]changelog.linux-2.3 | 3 ++- changelog.osx-2.3 | 3 ++- changelog.windows-2.3 | 3 ++- 10 files changed, 13 insertions(+), 10 deletions(-) diff --git a/README.LINUX-2.3 b/README.LINUX-2.3 index 76eb1f9..b2c18ce 100644 --- a/README.LINUX-2.3 +++ b/README.LINUX-2.3 @@ -5,7 +5,7 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.3.19-rc (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.3.20-rc (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 14.0.1 \_ Torbutton 1.4.6 |_ NoScript 2.5 diff --git a/README.OSX-2.3 b/README.OSX-2.3 index 6846c84..e197239 100644 --- a/README.OSX-2.3 +++ b/README.OSX-2.3 @@ -5,7 +5,7 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.3.19-rc (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.3.20-rc (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 14.0.1 \_ Torbutton 1.4.6 |_ NoScript 2.5 diff --git a/README.WIN-2.3 b/README.WIN-2.3 index b164b73..331a2a3 100644 --- a/README.WIN-2.3 +++ b/README.WIN-2.3 @@ -5,7 +5,7 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.3.19-rc (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.3.20-rc (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 14.0.1 \_ Torbutton 1.4.6 |_ NoScript 2.5 diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index a00d000..8427a10 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index e5ff243..c6376fd 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=i386 -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 6226abe..95625cc 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -8,7 +8,7 @@ LIBPNG_VER=1.5.12 QT_VER=4.8.1 VIDALIA_VER=0.2.20 LIBEVENT_VER=2.0.19-stable -TOR_VER=0.2.3.19-rc +TOR_VER=0.2.3.20-rc PIDGIN_VER=2.6.4 FIREFOX_VER=14.0.1 MOZBUILD_VER=1.5.1 diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 588f970..5847a34 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index d47fc8a..b4e14dd 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -1,5 +1,6 @@ -Tor Browser Bundle (2.3.19-alpha-2); suite=linux +Tor Browser Bundle (2.3.20-alpha-1); suite=linux + * Update Tor to 0.2.3.20-rc * Update libpng to 1.5.12 * Update NoScript to 2.5 * Change the urlbar search engine to Startpage (closes: #5925) diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index f31d9f9..2c19644 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -1,5 +1,6 @@ -Tor Browser Bundle (2.3.19-alpha-2); suite=osx +Tor Browser Bundle (2.3.20-alpha-1); suite=osx + * Update Tor to 0.2.3.20-rc * Update NoScript to 2.5 * Change the urlbar search engine to Startpage (closes: #5925) * Firefox patch updates: diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index 4774116..9d76818 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -1,5 +1,6 @@ -Tor Browser Bundle (2.3.19-alpha-2); suite=windows +Tor Browser Bundle (2.3.20-alpha-1); suite=windows + * Update Tor to 0.2.3.20-rc * Update NoScript to 2.5 * Change the urlbar search engine to Startpage (closes: #5925) * Firefox patch updates: [View Less]

1 0

r25743: {website} 0.2.3.20-rc tarball is up (website/trunk/include)
by Roger Dingledine 06 Aug '12

06 Aug '12

Author: arma Date: 2012-08-06 01:12:19 +0000 (Mon, 06 Aug 2012) New Revision: 25743 Modified: website/trunk/include/versions.wmi Log: 0.2.3.20-rc tarball is up Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-08-04 07:37:51 UTC (rev 25742) +++ website/trunk/include/versions.wmi 2012-08-06 01:12:19 UTC (rev 25743) @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.… [View More]

1 0

[torbrowser/maint-2.3] OSX: add copy-firefox target to build-all-binaries target
by erinn＠torproject.org 06 Aug '12

06 Aug '12

commit 5691211d89e5032555c770a615e10c5ada16d05e Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 6 02:02:10 2012 +0100 OSX: add copy-firefox target to build-all-binaries target --- build-scripts/osx-alpha.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 90c0a47..e5ff243 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -134,7 +134,7 @@ copy-firefox: -rm -… [View More]

1 0

[torbrowser/maint-2.3] bump all alpha tbbs to 2.3.19-alpha-2
by erinn＠torproject.org 06 Aug '12

06 Aug '12

commit 526910edb2c916c7b5aeeebffa2edad2f779b2f6 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 6 02:01:51 2012 +0100 bump all alpha tbbs to 2.3.19-alpha-2 --- README.LINUX-2.3 | 2 +- README.OSX-2.3 | 2 +- README.WIN-2.3 | 2 +- build-scripts/linux-alpha.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/windows-alpha.mk | 2 +- changelog.linux-2.3 | 12 ++++++++++++ changelog.… [View More]osx-2.3 | 11 +++++++++++ changelog.windows-2.3 | 11 +++++++++++ 9 files changed, 40 insertions(+), 6 deletions(-) diff --git a/README.LINUX-2.3 b/README.LINUX-2.3 index e6ae9a7..76eb1f9 100644 --- a/README.LINUX-2.3 +++ b/README.LINUX-2.3 @@ -8,7 +8,7 @@ Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.3.19-rc (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 14.0.1 \_ Torbutton 1.4.6 - |_ NoScript 2.4.8 + |_ NoScript 2.5 |_ HTTPS-Everywhere 3.0development.5 Usage diff --git a/README.OSX-2.3 b/README.OSX-2.3 index 87bf564..6846c84 100644 --- a/README.OSX-2.3 +++ b/README.OSX-2.3 @@ -8,7 +8,7 @@ Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.3.19-rc (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 14.0.1 \_ Torbutton 1.4.6 - |_ NoScript 2.4.8 + |_ NoScript 2.5 |_ HTTPS-Everywhere 3.0development.5 Usage diff --git a/README.WIN-2.3 b/README.WIN-2.3 index 40cd749..b164b73 100644 --- a/README.WIN-2.3 +++ b/README.WIN-2.3 @@ -8,7 +8,7 @@ Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.3.19-rc (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 14.0.1 \_ Torbutton 1.4.6 - |_ NoScript 2.4.8 + |_ NoScript 2.5 |_ HTTPS-Everywhere 3.0development.5 Usage diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 8427a10..a00d000 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index ad75326..90c0a47 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=i386 -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 5847a34..588f970 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index 5073d69..d47fc8a 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -1,5 +1,17 @@ Tor Browser Bundle (2.3.19-alpha-2); suite=linux + * Update libpng to 1.5.12 + * Update NoScript to 2.5 + * Change the urlbar search engine to Startpage (closes: #5925) + * Firefox patch updates: + - Fix the Tor Browser SIGFPE crash bug (closes: #6492) + - Add a redirect API for HTTPS-Everywhere (closes: #5477) + - Enable WebGL (as click-to-play only) (closes: #6370) + + -- Erinn Clark <erinn(a)torproject.org> Sun Aug 5 23:21:30 BST 2012 + +Tor Browser Bundle (2.3.19-alpha-1); suite=linux + * Update Tor to 0.2.3.19-rc * Update Firefox to 14.0.1 * Update libevent to 2.0.19-stable diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index cd4c54a..f31d9f9 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.3.19-alpha-2); suite=osx + + * Update NoScript to 2.5 + * Change the urlbar search engine to Startpage (closes: #5925) + * Firefox patch updates: + - Fix the Tor Browser SIGFPE crash bug (closes: #6492) + - Add a redirect API for HTTPS-Everywhere (closes: #5477) + - Enable WebGL (as click-to-play only) (closes: #6370) + + -- Erinn Clark <erinn(a)torproject.org> Sun Aug 5 23:21:27 BST 2012 + Tor Browser Bundle (2.3.19-alpha-1); suite=osx * Update Tor to 0.2.3.19-rc diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index 815f0db..4774116 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.3.19-alpha-2); suite=windows + + * Update NoScript to 2.5 + * Change the urlbar search engine to Startpage (closes: #5925) + * Firefox patch updates: + - Fix the Tor Browser SIGFPE crash bug (closes: #6492) + - Add a redirect API for HTTPS-Everywhere (closes: #5477) + - Enable WebGL (as click-to-play only) (closes: #6370) + + -- Erinn Clark <erinn(a)torproject.org> Sun Aug 5 23:21:32 BST 2012 + Tor Browser Bundle (2.3.19-alpha-1); suite=windows * Update Tor to 0.2.3.19-rc [View Less]

1 0

[torbrowser/master] bump all alpha tbbs to 2.3.19-alpha-2
by erinn＠torproject.org 06 Aug '12

06 Aug '12

commit 526910edb2c916c7b5aeeebffa2edad2f779b2f6 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 6 02:01:51 2012 +0100 bump all alpha tbbs to 2.3.19-alpha-2 --- README.LINUX-2.3 | 2 +- README.OSX-2.3 | 2 +- README.WIN-2.3 | 2 +- build-scripts/linux-alpha.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/windows-alpha.mk | 2 +- changelog.linux-2.3 | 12 ++++++++++++ changelog.… [View More]osx-2.3 | 11 +++++++++++ changelog.windows-2.3 | 11 +++++++++++ 9 files changed, 40 insertions(+), 6 deletions(-) diff --git a/README.LINUX-2.3 b/README.LINUX-2.3 index e6ae9a7..76eb1f9 100644 --- a/README.LINUX-2.3 +++ b/README.LINUX-2.3 @@ -8,7 +8,7 @@ Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.3.19-rc (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 14.0.1 \_ Torbutton 1.4.6 - |_ NoScript 2.4.8 + |_ NoScript 2.5 |_ HTTPS-Everywhere 3.0development.5 Usage diff --git a/README.OSX-2.3 b/README.OSX-2.3 index 87bf564..6846c84 100644 --- a/README.OSX-2.3 +++ b/README.OSX-2.3 @@ -8,7 +8,7 @@ Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.3.19-rc (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 14.0.1 \_ Torbutton 1.4.6 - |_ NoScript 2.4.8 + |_ NoScript 2.5 |_ HTTPS-Everywhere 3.0development.5 Usage diff --git a/README.WIN-2.3 b/README.WIN-2.3 index 40cd749..b164b73 100644 --- a/README.WIN-2.3 +++ b/README.WIN-2.3 @@ -8,7 +8,7 @@ Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.3.19-rc (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 14.0.1 \_ Torbutton 1.4.6 - |_ NoScript 2.4.8 + |_ NoScript 2.5 |_ HTTPS-Everywhere 3.0development.5 Usage diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 8427a10..a00d000 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index ad75326..90c0a47 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=i386 -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 5847a34..588f970 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index 5073d69..d47fc8a 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -1,5 +1,17 @@ Tor Browser Bundle (2.3.19-alpha-2); suite=linux + * Update libpng to 1.5.12 + * Update NoScript to 2.5 + * Change the urlbar search engine to Startpage (closes: #5925) + * Firefox patch updates: + - Fix the Tor Browser SIGFPE crash bug (closes: #6492) + - Add a redirect API for HTTPS-Everywhere (closes: #5477) + - Enable WebGL (as click-to-play only) (closes: #6370) + + -- Erinn Clark <erinn(a)torproject.org> Sun Aug 5 23:21:30 BST 2012 + +Tor Browser Bundle (2.3.19-alpha-1); suite=linux + * Update Tor to 0.2.3.19-rc * Update Firefox to 14.0.1 * Update libevent to 2.0.19-stable diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index cd4c54a..f31d9f9 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.3.19-alpha-2); suite=osx + + * Update NoScript to 2.5 + * Change the urlbar search engine to Startpage (closes: #5925) + * Firefox patch updates: + - Fix the Tor Browser SIGFPE crash bug (closes: #6492) + - Add a redirect API for HTTPS-Everywhere (closes: #5477) + - Enable WebGL (as click-to-play only) (closes: #6370) + + -- Erinn Clark <erinn(a)torproject.org> Sun Aug 5 23:21:27 BST 2012 + Tor Browser Bundle (2.3.19-alpha-1); suite=osx * Update Tor to 0.2.3.19-rc diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index 815f0db..4774116 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.3.19-alpha-2); suite=windows + + * Update NoScript to 2.5 + * Change the urlbar search engine to Startpage (closes: #5925) + * Firefox patch updates: + - Fix the Tor Browser SIGFPE crash bug (closes: #6492) + - Add a redirect API for HTTPS-Everywhere (closes: #5477) + - Enable WebGL (as click-to-play only) (closes: #6370) + + -- Erinn Clark <erinn(a)torproject.org> Sun Aug 5 23:21:32 BST 2012 + Tor Browser Bundle (2.3.19-alpha-1); suite=windows * Update Tor to 0.2.3.19-rc [View Less]

1 0

[torbrowser/master] Merge branch 'maint-2.3'
by erinn＠torproject.org 06 Aug '12

06 Aug '12

commit d4864766a26d31edccccb960ab96a88c46b79cb0 Merge: a82e8fb 5691211 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 6 02:02:49 2012 +0100 Merge branch 'maint-2.3' README.LINUX-2.3 | 2 +- README.OSX-2.3 | 2 +- README.WIN-2.3 | 2 +- build-scripts/linux-alpha.mk | 2 +- build-scripts/osx-alpha.mk | 4 ++-- build-scripts/windows-alpha.mk | 2 +- changelog.linux-2.3 | 12 ++++++++++++ … [View More]

1 0

[torbrowser/master] OSX: add copy-firefox target to build-all-binaries target
by erinn＠torproject.org 06 Aug '12

06 Aug '12

commit 5691211d89e5032555c770a615e10c5ada16d05e Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 6 02:02:10 2012 +0100 OSX: add copy-firefox target to build-all-binaries target --- build-scripts/osx-alpha.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 90c0a47..e5ff243 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -134,7 +134,7 @@ copy-firefox: -rm -… [View More]

1 0

[gettor/master] Add Karsten's statistics plotting script.
by kaner＠torproject.org 05 Aug '12

05 Aug '12

commit 1b26c63e72485e319cd1135fb26a5f751f87d127 Author: Christian Fromme <kaner(a)strace.org> Date: Sun Aug 5 20:52:35 2012 +0200 Add Karsten's statistics plotting script. --- PlotStat.py | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ setup.py | 2 +- 2 files changed, 75 insertions(+), 1 deletions(-) diff --git a/PlotStat.py b/PlotStat.py new file mode 100644 index 0000000..48df30e --- /dev/null +++ b/PlotStat.py @@ -0,0 +1,74 @@ +# Copyright 2012 The … [View More]Tor Project + +import os +import sys +import pylab +import matplotlib +import matplotlib.dates +from optparse import OptionParser +from datetime import datetime + +def parse_args(): + parser = OptionParser() + parser.add_option("-g", "--gettor-stats-file", default = "gettor_stats.txt", help = "Path to GetTor statistics file (default: %default)", metavar = "FILE") + parser.add_option("-s", "--start-date", help = "Start graph on given date (format: YYYY-MM-DD)", metavar = "DATE") + parser.add_option("-e", "--end-date", help = "End graph on given date (format: YYYY-MM-DD)", metavar = "DATE") + parser.add_option("-l", "--language", help = "Plot only packages for a given language code ('en', 'fa', 'zh_CN', etc.)", metavar = "LANG") + parser.add_option("-d", "--dpi", type = "int", default = 72, help = "Resolution in dpi (default: %default)", metavar = "NUM") + (options, args) = parser.parse_args() + if not os.path.exists(options.gettor_stats_file): + parser.error("Did not find gettor_stats.txt. Download from http://gettor.torproject.org:8080/~gettor/gettor_stats.txt.") + return options + +def read_gettor_stats_file(gettor_stats_file, start_date = None, end_date = None, language = None): + data = {} + with open(gettor_stats_file) as file: + for line in file.readlines(): + line = line.strip() + if not line: + continue + parts = line.split() + date = parts[0] + if start_date and date < start_date: + continue + if end_date and date > end_date: + continue + for part in parts[2:]: + key, value = part.split(":") + if key == "None" or value == "0": + continue + if language and not key.endswith("_" + language): + continue + if data.has_key(date): + data[date] += int(value) + else: + data[date] = int(value) + del data[max(data.keys())] + return data + +def plot_gettor_stats(gettor_data, language = None, dpi = 72): + dates = sorted(gettor_data.keys()) + datetimes = [datetime.strptime(date, "%Y-%m-%d") for date in dates] + values = [int(gettor_data[date]) for date in dates] + fig = pylab.figure() + ax = fig.gca() + ax.plot_date(pylab.date2num(datetimes), values, linestyle='-') + ax.grid(True) + ax.set_ybound(lower = 0) + if len(dates) < 30: + ax.xaxis.set_major_locator(matplotlib.dates.WeekdayLocator(byweekday = matplotlib.dates.MO)) + ax.xaxis.set_major_formatter(matplotlib.dates.DateFormatter('%b %d, %Y')) + if language: + title = "Packages (language: %s) requested from GetTor per day" % language + else: + title = "Total packages requested from GetTor per day" + pylab.title(title) + pylab.savefig("gettor.png", format = "png", dpi = dpi) + +if __name__ == "__main__": + options = parse_args() + data = read_gettor_stats_file(gettor_stats_file = options.gettor_stats_file, + start_date = options.start_date, end_date = options.end_date, + language = options.language) + plot_gettor_stats(data, language = options.language, dpi = options.dpi) + diff --git a/setup.py b/setup.py index 890180e..7954efc 100644 --- a/setup.py +++ b/setup.py @@ -105,7 +105,7 @@ setup(name='GetTor', url='https://www.torproject.org/gettor/', package_dir={'': 'lib'}, packages=['gettor'], - scripts = ["GetTor.py", "MakeStat.py"], + scripts = ["GetTor.py", "MakeStat.py", "PlotStat.py"], py_modules=['GetTor'], long_description = """Really long text here.""", cmdclass={'trans': createTrans, [View Less]

1 0

[tor/release-0.2.3] give 0.2.3.20-rc a blurb too
by arma＠torproject.org 05 Aug '12

05 Aug '12

commit 24d7a06f04d701c4dd263b911906cb1e97672e99 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Aug 5 02:16:03 2012 -0400 give 0.2.3.20-rc a blurb too --- ChangeLog | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e5465d..5f985e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ Changes in version 0.2.3.20-rc - 2012-08-05 + Tor 0.2.3.20-rc is the third release candidate for the Tor 0.2.3.x + series. It … [View More]

1 0