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

[metrics-tasks/master] task-6329: group relays while doing the selection
by karsten＠torproject.org 07 Aug '12

07 Aug '12

commit cb39df4d4011900be387c797bd091f5cf77a388f Author: delber <delber(a)riseup.net> Date: Thu Aug 2 11:05:43 2012 +0000 task-6329: group relays while doing the selection --- task-6329/tor-relays-stats.py | 46 ++++++++++++++++++++-------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/task-6329/tor-relays-stats.py b/task-6329/tor-relays-stats.py index da9eb6e..9706d80 100755 --- a/task-6329/tor-relays-stats.py +++ b/task-6329/tor-relays-stats.py @@ -111,6 +111,7 @@ class RelayStats(object): self._data = None self._filters = self._create_filters(options) self._get_group = self._get_group_function(options) + self._relays = None @property def data(self): @@ -118,6 +119,22 @@ class RelayStats(object): self._data = json.load(file('details.json')) return self._data + @property + def relays(self): + if self._relays: + return self._relays + + self._relays = {} + for relay in self.data['relays']: + accepted = True + for f in self._filters: + if not f.accept(relay): + accepted = False + break + if accepted: + self.add_relay(relay) + return self._relays + def _create_filters(self, options): filters = [] if not options.inactive: @@ -146,26 +163,11 @@ class RelayStats(object): else: return lambda relay: relay.get('fingerprint') - def get_relays(self): - relays = [] - for relay in self.data['relays']: - accepted = True - for f in self._filters: - if not f.accept(relay): - accepted = False - break - if accepted: - relays.append(relay) - return relays - - def group_relays(self, relays): - grouped_relays = {} - for relay in relays: - key = self._get_group(relay) - if key not in grouped_relays: - grouped_relays[key] = [] - grouped_relays[key].append(relay) - return grouped_relays + def add_relay(self, relay): + key = self._get_group(relay) + if key not in self._relays: + self._relays[key] = [] + self._relays[key].append(relay) def format_and_sort_groups(self, grouped_relays, by_country=False, by_as_number=False, links=False): formatted_groups = {} @@ -304,9 +306,7 @@ if '__main__' == __name__: parser.error("Did not find details.json. Re-run with --download.") stats = RelayStats(options) - relays = stats.get_relays() - grouped_relays = stats.group_relays(relays) - sorted_groups = stats.format_and_sort_groups(grouped_relays, + sorted_groups = stats.format_and_sort_groups(stats.relays, by_country=options.by_country, by_as_number=options.by_as, links=options.links)

1 0

r25744: {website} bump the alpha version to match current. (website/trunk)
by Andrew Lewman 06 Aug '12

06 Aug '12

Author: phobos Date: 2012-08-06 20:36:27 +0000 (Mon, 06 Aug 2012) New Revision: 25744 Modified: website/trunk/Makefile Log: bump the alpha version to match current. Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2012-08-06 01:12:19 UTC (rev 25743) +++ website/trunk/Makefile 2012-08-06 20:36:27 UTC (rev 25744) @@ -11,7 +11,7 @@ # 5. ./publish export STABLETAG=tor-0.2.2.37 -export DEVTAG=tor-0.2.3.17-beta +export DEVTAG=tor-0.2.3.20-rc WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 06 Aug '12

06 Aug '12

commit 49cfdabde0104a920585121f9678d13c7d772db1 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 6 19:45:32 2012 +0000 Update translations for https_everywhere_completed --- de/https-everywhere.properties | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/de/https-everywhere.properties b/de/https-everywhere.properties index 5fc8f97..38a632e 100644 --- a/de/https-everywhere.properties +++ b/de/https-everywhere.properties @@ -1,3 +1,5 @@ https-everywhere.menu.globalEnable = HTTPS Everywhere aktivieren https-everywhere.menu.globalDisable = HTTPS Everywhere deaktivieren - +https-everywhere.menu.enableDisable = Regeln Aktivieren / Deaktivieren +https-everywhere.menu.noRules = (Keine Regeln für diese Seite) +https-everywhere.menu.unknownRules = (Regeln für diese Seite unbekannt)

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 06 Aug '12

06 Aug '12

commit d44795c2851da0c37423a441d2c65e0b9bb93042 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 6 19:45:29 2012 +0000 Update translations for https_everywhere --- de/https-everywhere.properties | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/de/https-everywhere.properties b/de/https-everywhere.properties index 469b39f..38a632e 100644 --- a/de/https-everywhere.properties +++ b/de/https-everywhere.properties @@ -1,5 +1,5 @@ https-everywhere.menu.globalEnable = HTTPS Everywhere aktivieren https-everywhere.menu.globalDisable = HTTPS Everywhere deaktivieren -# https-everywhere.menu.enableDisable = Enable / Disable Rules -# https-everywhere.menu.noRules = (No Rules for This Page) -# https-everywhere.menu.unknownRules = (Rules for This Page Unknown) +https-everywhere.menu.enableDisable = Regeln Aktivieren / Deaktivieren +https-everywhere.menu.noRules = (Keine Regeln für diese Seite) +https-everywhere.menu.unknownRules = (Regeln für diese Seite unbekannt)

1 0

[metrics-lib/master] Accept transport lines containing more than just the transport name.
by karsten＠torproject.org 06 Aug '12

06 Aug '12

commit 25f0e656c467121c9316876584b1762e7d4bd166 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 6 08:08:44 2012 +0200 Accept transport lines containing more than just the transport name. Sanitized bridge descriptors contain transport lines with just the transport name. However, there are now relays including unsanitized transport lines, most likely because of a configuration problem. Don't reject the entire descriptor when encountering those lines. --- .../descriptor/impl/ExtraInfoDescriptorImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java index 0a0bf1a..45848d2 100644 --- a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java @@ -571,7 +571,7 @@ public class ExtraInfoDescriptorImpl extends DescriptorImpl private void parseTransportLine(String line, String lineNoOpt, String[] partsNoOpt) throws DescriptorParseException { - if (partsNoOpt.length != 2) { + if (partsNoOpt.length < 2) { throw new DescriptorParseException("Illegal line '" + line + "'."); } this.transports.add(partsNoOpt[1]);

1 0

[stem/master] Fully parsing transport lines
by atagar＠torproject.org 06 Aug '12

06 Aug '12

commit ac5be8cee5f58517c09217fd6860f7ef483dacc2 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 5 20:14:18 2012 -0700 Fully parsing transport lines The extrainfo descriptor's new transport lines were a little funny in that they're only relevant to bridges, and when they apprear in bridges they're scrubbed of everything except the transport name. This in turn meant that they only appeared with transport names in the wild. However, now that transport lines can appear in non-bridge relays I'll sometimes see complete transport lines, so parsing and validating them properly. --- stem/descriptor/extrainfo_descriptor.py | 41 ++++++++++++++++++++++--- test/unit/descriptor/extrainfo_descriptor.py | 4 +- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 8d66df6..a589139 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -179,7 +179,7 @@ class ExtraInfoDescriptor(stem.descriptor.Descriptor): :var str fingerprint: **\*** identity key fingerprint :var datetime published: **\*** time in GMT when this descriptor was made :var str geoip_db_digest: sha1 of geoIP database file - :var list transport: transport method recognized by the bridge (ex. obfs3) + :var dict transport: **\*** mapping of transport methods to their (address, port, args) tuple, these usually appeear on bridges in which case all of those are None **Bi-directional connection usage:** @@ -288,7 +288,7 @@ class ExtraInfoDescriptor(stem.descriptor.Descriptor): self.fingerprint = None self.published = None self.geoip_db_digest = None - self.transport = None + self.transport = {} self.conn_bi_direct_end = None self.conn_bi_direct_interval = None @@ -432,10 +432,41 @@ class ExtraInfoDescriptor(stem.descriptor.Descriptor): # on non-bridges in the wild when the relay operator configured it this # way. - if self.transport is None: - self.transport = [] + name, address, port, args = None, None, None, None - self.transport.append(value) + if not ' ' in value: + # scrubbed + name = value + else: + # not scrubbed + value_comp = value.split() + + if len(value_comp) < 1: + raise ValueError("Transport line is missing its transport name: %s" % line) + else: + name = value_comp[0] + + if len(value_comp) < 2: + raise ValueError("Transport line is missing its address:port value: %s" % line) + elif not ":" in value_comp[1]: + raise ValueError("Transport line's address:port entry is missing a colon: %s" % line) + else: + address, port_str = value_comp[1].split(':', 1) + + if not stem.util.connection.is_valid_ip_address(address) or \ + stem.util.connection.is_valid_ipv6_address(address): + raise ValueError("Transport line has a malformed address: %s" % line) + elif not stem.util.connection.is_valid_port(port_str): + raise ValueError("Transport line has a malformed port: %s" % line) + + port = int(port_str) + + if len(value_comp) >= 3: + args = value_comp[2:] + else: + args = [] + + self.transport[name] = (address, port, args) elif keyword == "cell-circuits-per-decile": # "cell-circuits-per-decile" num diff --git a/test/unit/descriptor/extrainfo_descriptor.py b/test/unit/descriptor/extrainfo_descriptor.py index 1008af7..54d6bf8 100644 --- a/test/unit/descriptor/extrainfo_descriptor.py +++ b/test/unit/descriptor/extrainfo_descriptor.py @@ -527,12 +527,12 @@ class TestExtraInfoDescriptor(unittest.TestCase): desc_text = _make_descriptor({"transport": "obfs3"}, is_bridge = True) desc = BridgeExtraInfoDescriptor(desc_text) - self.assertEquals(["obfs3"], desc.transport) + self.assertEquals({"obfs3": (None, None, None)}, desc.transport) self.assertEquals([], desc.get_unrecognized_lines()) desc_text = _make_descriptor({"transport": "obfs2 83.212.96.201:33570"}) desc = RelayExtraInfoDescriptor(desc_text) - self.assertEquals(["obfs2 83.212.96.201:33570"], desc.transport) + self.assertEquals({"obfs2": ("83.212.96.201", 33570, [])}, desc.transport) self.assertEquals([], desc.get_unrecognized_lines()) def _expect_invalid_attr(self, desc_text, attr = None, expected_value = None):

1 0

[torbrowser/maint-2.3] bump the version number in the versions file...
by erinn＠torproject.org 06 Aug '12

06 Aug '12

commit a1908663a731b3862cc65bf1c2d7972f94440254 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 6 02:21:37 2012 +0100 bump the version number in the versions file... --- build-scripts/versions-alpha.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 95625cc..4efc8db 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.3.19-alpha +RELEASE_VER=2.3.20-alpha ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c

1 0

[torbrowser/master] bump the version number in the versions file...
by erinn＠torproject.org 06 Aug '12

06 Aug '12

commit a1908663a731b3862cc65bf1c2d7972f94440254 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 6 02:21:37 2012 +0100 bump the version number in the versions file... --- build-scripts/versions-alpha.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 95625cc..4efc8db 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.3.19-alpha +RELEASE_VER=2.3.20-alpha ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c

1 0

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

06 Aug '12

commit 566fd4a74298d59eee2e367753b49c23074d10cd Merge: c85e20f a190866 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 6 02:21:54 2012 +0100 Merge branch 'maint-2.3' build-scripts/versions-alpha.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torbrowser/maint-2.3] 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 +- 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:

1 0