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

r25310: {website} Remove xenobite references (in website/trunk: docs/en projects/en)
by Sebastian Hahn 16 Jan '12

16 Jan '12

Author: sebastian Date: 2012-01-16 11:12:17 +0000 (Mon, 16 Jan 2012) New Revision: 25310 Modified: website/trunk/docs/en/documentation.wml website/trunk/projects/en/projects.wml Log: Remove xenobite references Modified: website/trunk/docs/en/documentation.wml =================================================================== --- website/trunk/docs/en/documentation.wml 2012-01-16 10:56:03 UTC (rev 25309) +++ website/trunk/docs/en/documentation.wml 2012-01-16 11:12:17 UTC (rev 25310) @@ -247,11 +247,9 @@ list of supporting programs you might want to use in association with Tor</a>.</li> <li><a href="https://check.torproject.org/">The - Tor detector</a> or <a href="http://torcheck.xenobite.eu/">the other - Tor detector</a> try to guess if you're using Tor or not.</li> + Tor detector</a> tries to guess if you're using Tor or not.</li> <li>Check out one of the Tor status pages, such as <a - href="http://torstatus.blutmagie.de/">blutmagie's</a>, or - Xenobite's <a href="https://torstat.xenobite.eu/">Tor node status</a> page. + href="http://torstatus.blutmagie.de/">blutmagie's Tor node status</a> page. Remember that these lists may not be as accurate as what your Tor client uses, because your client fetches its own directory information and examines it locally.</li> Modified: website/trunk/projects/en/projects.wml =================================================================== --- website/trunk/projects/en/projects.wml 2012-01-16 10:56:03 UTC (rev 25309) +++ website/trunk/projects/en/projects.wml 2012-01-16 11:12:17 UTC (rev 25310) @@ -63,8 +63,7 @@ <div class="name"><a href="http://torstatus.blutmagie.de/">TorStatus</a></div> <p>Portal providing an overview of the Tor network, including a list of its current relays and details on each. Mirrors are also available from <a -href="https://torstat.xenobite.eu/">Xenobite</a>, <a -href="http://torstatus.cyberphunk.org/">cyberphunk</a>, and others.</p> +href="http://torstatus.cyberphunk.org/">cyberphunk</a> and others.</p> </td> <td> <div class="name"><a href="https://metrics.torproject.org/">Metrics Portal</a></div>

1 0

[metrics-tasks/master] Add graphing code for #4686.
by karsten＠torproject.org 16 Jan '12

16 Jan '12

commit 7469525be32159d6ca783f5e5c7e8af2c0856588 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 16 11:55:07 2012 +0100 Add graphing code for #4686. --- task-4686/.gitignore | 4 ++++ task-4686/download-stats.R | 13 +++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/task-4686/.gitignore b/task-4686/.gitignore new file mode 100644 index 0000000..23b548f --- /dev/null +++ b/task-4686/.gitignore @@ -0,0 +1,4 @@ +Rplots.pdf +download-stats.csv +download-stats.png + diff --git a/task-4686/download-stats.R b/task-4686/download-stats.R new file mode 100644 index 0000000..bdc599c --- /dev/null +++ b/task-4686/download-stats.R @@ -0,0 +1,13 @@ +library(ggplot2) +d <- read.csv("download-stats.csv", header = FALSE, + col.names = c("dirauth", "download", "seconds")) +ggplot(d, aes(x = as.POSIXct(download / 1000, + origin = "1970-01-01 00:00:00"), y = seconds / 1000)) + +geom_point(alpha = 0.25) + +facet_wrap(~ dirauth) + +scale_x_datetime(name = "", major = "1 month", minor = "1 week", + format = "%b %d, %Y") + +scale_y_continuous(name = "", limits = c(0, max(d$seconds) / 1000)) + +opts(title = "Consensus download times in seconds\n") +ggsave("download-stats.png", width = 8, height = 6, dpi = 100) +

1 0

r25309: {website} Revert part of "get all the expert bundle versions" This rev (website/trunk)
by Sebastian Hahn 16 Jan '12

16 Jan '12

Author: sebastian Date: 2012-01-16 10:56:03 +0000 (Mon, 16 Jan 2012) New Revision: 25309 Modified: website/trunk/Makefile website/trunk/publish Log: Revert part of "get all the expert bundle versions" This reverts commit 2790f8f20f2398eda08bd8e98b4930327a63b8eb. Looks like some stuff got accidentally committed, most importantly the make clean removal and the change of the stable/alpha version Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2012-01-16 10:47:27 UTC (rev 25308) +++ website/trunk/Makefile 2012-01-16 10:56:03 UTC (rev 25309) @@ -2,7 +2,7 @@ # # 1. Clone the Tor git repository and make TORGIT point to it: # -# git clone git://git.torproject.org/tor/ tor +# git clone git://git.torproject.org/tor/ tor.git # # Note that you will need to point to the actual .git directory. # 2. Edit include/versions.wmi or others if you like @@ -10,9 +10,9 @@ # 4. make # 5. ./publish -export TORGIT=/Users/erinn/src/tor.git/.git -export STABLETAG=tor-0.2.2.24-alpha -export DEVTAG=tor-0.2.2.24-alpha +export TORGIT=set this to your tor.git path +export STABLETAG=tor-0.2.2.35 +export DEVTAG=tor-0.2.3.10-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton Modified: website/trunk/publish =================================================================== --- website/trunk/publish 2012-01-16 10:47:27 UTC (rev 25308) +++ website/trunk/publish 2012-01-16 10:56:03 UTC (rev 25309) @@ -1,8 +1,13 @@ #!/bin/sh set -e # stop if we encounter an error +# pull the latest changes svn update + +# clean up the working directory make clean + +# actually build the site make -j3 # don't copy over stuff with permissions that make it useless

1 0

r25308: {website} Comment out IM TBB section (website/trunk/projects/en)
by Sebastian Hahn 16 Jan '12

16 Jan '12

Author: sebastian Date: 2012-01-16 10:47:27 +0000 (Mon, 16 Jan 2012) New Revision: 25308 Modified: website/trunk/projects/en/torbrowser-split.wml Log: Comment out IM TBB section Modified: website/trunk/projects/en/torbrowser-split.wml =================================================================== --- website/trunk/projects/en/torbrowser-split.wml 2012-01-16 00:39:25 UTC (rev 25307) +++ website/trunk/projects/en/torbrowser-split.wml 2012-01-16 10:47:27 UTC (rev 25308) @@ -59,7 +59,7 @@ </ul> - <p id="Download-torimbrowserbundle" style="font-size: 120%; margin: 5mm">Tor IM Browser Bundle for Windows with Firefox and Pidgin (version <version-torimbrowserbundle>, split edition, 24 MB total)</p> + <p>Note that the Firefox in our bundle is <a href="<tbbrepo>/build-scripts/config/">modified</a> from the <a href="http://www.mozilla.com/firefox/">default Firefox</a>;

1 0

[doctor/master] Fix error message.
by karsten＠torproject.org 16 Jan '12

16 Jan '12

commit 561ffcecea6f8d466c05719dfd06442a14c3e64f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 16 11:38:53 2012 +0100 Fix error message. --- src/org/torproject/doctor/StatusFileReport.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/doctor/StatusFileReport.java b/src/org/torproject/doctor/StatusFileReport.java index 18def6f..040a687 100644 --- a/src/org/torproject/doctor/StatusFileReport.java +++ b/src/org/torproject/doctor/StatusFileReport.java @@ -50,8 +50,9 @@ public class StatusFileReport { String line; while ((line = br.readLine()) != null) { if (!line.contains(": ")) { - System.err.println("Bad line in stats/chc-last-warned: '" - + line + "'. Ignoring this line."); + System.err.println("Bad line in " + + lastWarnedFile.getAbsolutePath() + ": '" + line + + "'. Ignoring this line."); continue; } long warnedMillis = Long.parseLong(line.substring(0,

1 0

[stem/master] Minor update to stem/util/conf.py
by atagar＠torproject.org 16 Jan '12

16 Jan '12

commit 6c5f0205682877c76d6633abce487673787f5d9b Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sat Jan 14 21:32:31 2012 +0530 Minor update to stem/util/conf.py - More pythonic way of doing File I/O - Use try and catch the exception while parsing the config file instead of using an if-else logic. - Log messages when the (key, value) are not provided in the proper format in the config file. - Typos --- stem/util/conf.py | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stem/util/conf.py b/stem/util/conf.py index 4c468d7..c226f40 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -150,9 +150,8 @@ class Config(): permissions, etc) """ - config_file = open(path, "r") - read_contents = config_file.readlines() - config_file.close() + with open(path, "r") as config_file: + read_contents = config_file.readlines() self._contents_lock.acquire() self._raw_contents = read_contents @@ -165,11 +164,12 @@ class Config(): # parse the key/value pair if line: - if " " in line: + try: key, value = line.split(" ", 1) - value = value.strip() - else: + except ValueError: + log.debug("Config entry '%s' is expected to be of the format 'Key Value', defaulting to '%s' -> ''" % (line, line)) key, value = line, "" + value = value.strip() self.set(key, value) @@ -333,7 +333,7 @@ class Config(): def get_value(self, key, default = None, multiple = False): """ - This provides the currently value associated with a given key. + This provides the current value associated with a given key. Arguments: key (str) - config setting to be fetched

1 0

[stem/master] Add stem.util.conf.save()
by atagar＠torproject.org 16 Jan '12

16 Jan '12

commit 451e13eb9552ab448072b863b180a338a4baeb24 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Jan 15 23:16:06 2012 +0530 Add stem.util.conf.save() This saves all the contents in the config file. It overwrites the contents of the original config file. The comments of the original file will be lost. --- stem/util/conf.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/stem/util/conf.py b/stem/util/conf.py index c226f40..0c98206 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -439,3 +439,11 @@ class Config(): return default else: return [int(val) for val in conf_comp] + def save(self): + self._contents_lock.acquire() + + with open(path, 'w') as f: + for entry in self.keys(): + f.write('%s %s\n' % (entry, self.get(entry))) + + self._contents_lock.release()

1 0

[stem/master] Minor fixes for conf.save()
by atagar＠torproject.org 16 Jan '12

16 Jan '12

commit 94479aadebcaeee26d57b91e4900dad56edaeb91 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 15 22:13:32 2012 -0800 Minor fixes for conf.save() Sorting the keys prior to saving, handling multi-value keys, and trivial changes (whitespace, reordering, and putting the strip call in the try block which is the only place it's needed). --- stem/util/conf.py | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/stem/util/conf.py b/stem/util/conf.py index 0c98206..199a20c 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -15,6 +15,7 @@ would be loaded as four entries, the last one's value being an empty string. get_config - Singleton for getting configurations Config - Custom configuration. |- load - reads a configuration file + |- save - writes the current configuration to a file |- clear - empties our loaded configuration contents |- update - replaces mappings in a dictionary with the config's values |- keys - provides keys in the loaded configuration @@ -166,16 +167,29 @@ class Config(): if line: try: key, value = line.split(" ", 1) + value = value.strip() except ValueError: log.debug("Config entry '%s' is expected to be of the format 'Key Value', defaulting to '%s' -> ''" % (line, line)) key, value = line, "" - value = value.strip() self.set(key, value) self._path = path self._contents_lock.release() + def save(self): + self._contents_lock.acquire() + + config_keys = self.keys() + config_keys.sort() + + with open(path, 'w') as f: + for entry_key in config_keys: + for entry_value in self.get_value(entry_key, multiple = True): + f.write('%s %s\n' % (entry_key, entry_value)) + + self._contents_lock.release() + def clear(self): """ Drops the configuration contents and reverts back to a blank, unloaded @@ -439,11 +453,3 @@ class Config(): return default else: return [int(val) for val in conf_comp] - def save(self): - self._contents_lock.acquire() - - with open(path, 'w') as f: - for entry in self.keys(): - f.write('%s %s\n' % (entry, self.get(entry))) - - self._contents_lock.release()

1 0

r25307: {website} update the mirrors with two new sites. (in website/trunk: . include)
by Andrew Lewman 16 Jan '12

16 Jan '12

Author: phobos Date: 2012-01-16 00:39:25 +0000 (Mon, 16 Jan 2012) New Revision: 25307 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: update the mirrors with two new sites. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-01-13 00:30:29 UTC (rev 25306) +++ website/trunk/include/mirrors-table.wmi 2012-01-16 00:39:25 UTC (rev 25307) @@ -188,23 +188,6 @@ <tr> - <td>AT</td> - - <td>FoDT.IT</td> - - <td>Up to date</td> - - <td><a href="ftp://ftp.fodt.it/pub/mirror/tor/">ftp</a></td> - <td><a href="http://tor.fodt.it/dist/">http</a></td> - <td><a href="http://tor.fodt.it/">http</a></td> - <td><a href="https://tor.fodt.it/dist/">https</a></td> - <td><a href="https://tor.fodt.it/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>FR</td> <td>BarkerJr</td> @@ -341,23 +324,6 @@ <tr> - <td>US</td> - - <td>NW Linux</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://torproject.nwlinux.us/dist/">http</a></td> - <td><a href="http://torproject.nwlinux.us/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> -</tr> - -<tr> - <td>DE</td> <td>borgmann.tv</td> @@ -443,49 +409,49 @@ <tr> - <td>SE</td> + <td>DE</td> - <td>homosu</td> + <td>spline</td> <td>Up to date</td> + <td><a href="ftp://ftp.spline.de/pub/tor">ftp</a></td> + <td><a href="http://tor.spline.de/dist/">http</a></td> + <td><a href="http://tor.spline.de/">http</a></td> <td> - </td> - <td><a href="http://tor.homosu.net/dist/">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> + <td><a href="rsync://ftp.spline.de/tor">rsync</a></td> </tr> <tr> - <td>DE</td> + <td>IS</td> - <td>[[:bbs:]]</td> + <td>TheOnionRouter</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.blingblingsquad.net/dist">http</a></td> - <td><a href="http://tor.blingblingsquad.net/">http</a></td> - <td><a href="https://tor.blingblingsquad.net/dist">https</a></td> - <td><a href="https://tor.blingblingsquad.net/">https</a></td> + <td><a href="http://theonionrouter.com/dist/">http</a></td> + <td><a href="http://theonionrouter.com/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>INT</td> + <td>SE</td> - <td>CoralCDN</td> + <td>homosu</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> + <td><a href="http://tor.homosu.net/dist/">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -494,17 +460,17 @@ <tr> - <td>IS</td> + <td>DE</td> - <td>crypto.is</td> + <td>[[:bbs:]]</td> <td>Up to date</td> <td> - </td> - <td><a href="https://torproject.crypto.is/dist/">http</a></td> - <td><a href="https://torproject.crypto.is/">http</a></td> - <td><a href="https://torproject.crypto.is/dist/">https</a></td> - <td><a href="https://torproject.crypto.is/">https</a></td> + <td><a href="http://tor.blingblingsquad.net/dist">http</a></td> + <td><a href="http://tor.blingblingsquad.net/">http</a></td> + <td><a href="https://tor.blingblingsquad.net/dist">https</a></td> + <td><a href="https://tor.blingblingsquad.net/">https</a></td> <td> - </td> <td> - </td> </tr> @@ -513,17 +479,17 @@ <td>IS</td> - <td>TheOnionRouter</td> + <td>crypto.is</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> - <td><a href="http://theonionrouter.com/dist/">http</a></td> - <td><a href="http://theonionrouter.com/">http</a></td> + <td><a href="https://torproject.crypto.is/dist/">http</a></td> + <td><a href="https://torproject.crypto.is/">http</a></td> + <td><a href="https://torproject.crypto.is/dist/">https</a></td> + <td><a href="https://torproject.crypto.is/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> @@ -664,6 +630,40 @@ <tr> + <td>AT</td> + + <td>FoDT.IT</td> + + <td>Unknown</td> + + <td><a href="ftp://ftp.fodt.it/pub/mirror/tor/">ftp</a></td> + <td><a href="http://tor.fodt.it/dist/">http</a></td> + <td><a href="http://tor.fodt.it/">http</a></td> + <td><a href="https://tor.fodt.it/dist/">https</a></td> + <td><a href="https://tor.fodt.it/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>US</td> + + <td>NW Linux</td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://torproject.nwlinux.us/dist/">http</a></td> + <td><a href="http://torproject.nwlinux.us/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> +</tr> + +<tr> + <td>NL</td> <td></td> @@ -678,3 +678,37 @@ <td> - </td> <td> - </td> </tr> + +<tr> + + <td></td> + + <td>torland</td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://mirror.torland.me/dist/">http</a></td> + <td><a href="http://mirror.torland.me/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>INT</td> + + <td>CoralCDN</td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-01-13 00:30:29 UTC (rev 25306) +++ website/trunk/update-mirrors.pl 2012-01-16 00:39:25 UTC (rev 25307) @@ -839,6 +839,42 @@ httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", + }, + mirror051 => { + adminContact => "", + orgName => "torland", + isoCC => "", + subRegion => "", + region => "", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://mirror.torland.me/", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://mirror.torland.me/dist/", + httpsDistMirror => "", + rsyncDistMirror => "", + hiddenServiceMirror => "", + }, + mirror052 => { + adminContact => "", + orgName => "spline", + isoCC => "DE", + subRegion => "", + region => "DE", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://tor.spline.de/", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "rsync://ftp.spline.de/tor", + ftpWebsiteMirror => "ftp://ftp.spline.de/pub/tor", + httpDistMirror => "http://tor.spline.de/dist/", + httpsDistMirror => "", + rsyncDistMirror => "rsync://ftp.spline.de/tor/dist", + hiddenServiceMirror => "", } );

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 15 Jan '12

15 Jan '12

commit c0f3cfd99edbfb65f4423dbc9cf43d3575183401 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 15 22:45:06 2012 +0000 Update translations for orbot --- values-nl/strings.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/values-nl/strings.xml b/values-nl/strings.xml index 93537b4..9e6e4e1 100644 --- a/values-nl/strings.xml +++ b/values-nl/strings.xml @@ -195,6 +195,6 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai <string name="unable_to_read_hidden_service_name">Kan hidden service naam niet lezen.</string> <string name="unable_to_start_tor">Kan Tor niet starten:</string> <string name="pref_use_sys_iptables_title">Gebruik standaard iptables</string> - <string name="pref_use_sys_iptables_summary">gebruik de ingebouwde iptables binary in plaats van degene gekoppeld aan Orbot</string> - <string name="error_installing_binares"></string> + <string name="pref_use_sys_iptables_summary">gebruik de ingebouwde iptables binary in plaats van de aan Orbot gekoppelde.</string> + <string name="error_installing_binares">De Tor binaries konden niet worden geïnstalleerd of geüpgraded.</string> </resources>

1 0