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

[stem/master] Supporting '-legacy' authority entries
by atagar＠torproject.org 10 Jan '13

10 Jan '13

commit 153ada322653f95eb21c360d3cac4fe6ad436ed7 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 10 08:37:17 2013 -0800 Supporting '-legacy' authority entries Directory authorities have an alternative format if their nickname has a '-legacy' suffix. Caught by Karsten on... https://trac.torproject.org/7866 --- stem/descriptor/networkstatus.py | 29 ++++++++++++++++--- .../networkstatus/directory_authority.py | 23 +++++++++++++++ test/unit/descriptor/networkstatus/document_v3.py | 15 ++++++++++ 3 files changed, 62 insertions(+), 5 deletions(-) diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 5da190a..e3d5779 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -909,17 +909,24 @@ class DirectoryAuthority(stem.descriptor.Descriptor): """ Directory authority information obtained from a v3 network status document. + Authorities can optionally use a legacy format. These are no longer found in + practice, but have the following differences... + + * The authority's nickname ends with '-legacy'. + * There's no **contact** or **vote_digest** attribute. + :var str nickname: **\*** authority's nickname :var str fingerprint: **\*** authority's fingerprint :var str hostname: **\*** hostname of the authority :var str address: **\*** authority's IP address :var int dir_port: **\*** authority's DirPort :var int or_port: **\*** authority's ORPort - :var str contact: **\*** contact information + :var bool is_legacy: **\*** if the authority's using the legacy format + :var str contact: contact information, this is included if is_legacy is **False** **Consensus Attributes:** - :var str vote_digest: **\*** digest of the authority that contributed to the consensus + :var str vote_digest: digest of the authority that contributed to the consensus, this is included if is_legacy is **False** **Vote Attributes:** @@ -950,6 +957,7 @@ class DirectoryAuthority(stem.descriptor.Descriptor): self.address = None self.dir_port = None self.or_port = None + self.is_legacy = False self.contact = None self.vote_digest = None @@ -990,7 +998,15 @@ class DirectoryAuthority(stem.descriptor.Descriptor): # check that we have mandatory fields if validate: - required_fields, excluded_fields = ["dir-source", "contact"], [] + is_legacy, dir_source_entry = False, entries.get("dir-source") + + if dir_source_entry: + is_legacy = dir_source_entry[0][0].split()[0].endswith("-legacy") + + required_fields, excluded_fields = ["dir-source"], [] + + if not is_legacy: + required_fields += ["contact"] if is_vote: if not key_cert_content: @@ -1001,7 +1017,9 @@ class DirectoryAuthority(stem.descriptor.Descriptor): if key_cert_content: raise ValueError("Authority consensus entries shouldn't have a key certificate:\n%s" % content) - required_fields += ["vote-digest"] + if not is_legacy: + required_fields += ["vote-digest"] + excluded_fields += ["legacy-dir-key"] for keyword in required_fields: @@ -1033,7 +1051,7 @@ class DirectoryAuthority(stem.descriptor.Descriptor): raise ValueError("Authority entry's 'dir-source' line must have six values: %s" % line) if validate: - if not stem.util.tor_tools.is_valid_nickname(dir_source_comp[0]): + if not stem.util.tor_tools.is_valid_nickname(dir_source_comp[0].rstrip('-legacy')): raise ValueError("Authority's nickname is invalid: %s" % dir_source_comp[0]) elif not stem.util.tor_tools.is_valid_fingerprint(dir_source_comp[1]): raise ValueError("Authority's fingerprint is invalid: %s" % dir_source_comp[1]) @@ -1055,6 +1073,7 @@ class DirectoryAuthority(stem.descriptor.Descriptor): self.address = dir_source_comp[3] self.dir_port = None if dir_source_comp[4] == '0' else int(dir_source_comp[4]) self.or_port = int(dir_source_comp[5]) + self.is_legacy = self.nickname.endswith("-legacy") elif keyword == 'contact': # "contact" string diff --git a/test/unit/descriptor/networkstatus/directory_authority.py b/test/unit/descriptor/networkstatus/directory_authority.py index eb685df..539b6b1 100644 --- a/test/unit/descriptor/networkstatus/directory_authority.py +++ b/test/unit/descriptor/networkstatus/directory_authority.py @@ -22,6 +22,7 @@ class TestDirectoryAuthority(unittest.TestCase): self.assertEqual("76.73.17.194", authority.address) self.assertEqual(9030, authority.dir_port) self.assertEqual(9090, authority.or_port) + self.assertEqual(False, authority.is_legacy) self.assertEqual("Mike Perry <email>", authority.contact) self.assertEqual("0B6D1E9A300B895AA2D0B427F92917B6995C3C1C", authority.vote_digest) self.assertEqual(None, authority.legacy_dir_key) @@ -41,6 +42,7 @@ class TestDirectoryAuthority(unittest.TestCase): self.assertEqual("76.73.17.194", authority.address) self.assertEqual(9030, authority.dir_port) self.assertEqual(9090, authority.or_port) + self.assertEqual(False, authority.is_legacy) self.assertEqual("Mike Perry <email>", authority.contact) self.assertEqual(None, authority.vote_digest) self.assertEqual(None, authority.legacy_dir_key) @@ -55,6 +57,27 @@ class TestDirectoryAuthority(unittest.TestCase): authority = get_directory_authority({"pepperjack": "is oh so tasty!"}) self.assertEquals(["pepperjack is oh so tasty!"], authority.get_unrecognized_lines()) + def test_legacy_authority(self): + """ + Parses an authority using the '-legacy' format. + """ + + content = "dir-source gabelmoo-legacy 81349FC1F2DBA2C2C11B45CB9706637D480AB913 212.112.245.170 212.112.245.170 80 443" + authority = DirectoryAuthority(content, is_vote = False) + + self.assertEqual("gabelmoo-legacy", authority.nickname) + self.assertEqual("81349FC1F2DBA2C2C11B45CB9706637D480AB913", authority.fingerprint) + self.assertEqual("212.112.245.170", authority.hostname) + self.assertEqual("212.112.245.170", authority.address) + self.assertEqual(80, authority.dir_port) + self.assertEqual(443, authority.or_port) + self.assertEqual(True, authority.is_legacy) + self.assertEqual(None, authority.contact) + self.assertEqual(None, authority.vote_digest) + self.assertEqual(None, authority.legacy_dir_key) + self.assertEqual(None, authority.key_certificate) + self.assertEqual([], authority.get_unrecognized_lines()) + def test_first_line(self): """ Includes a non-mandatory field before the 'dir-source' line. diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index d15e88a..42603b1 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -787,6 +787,21 @@ class TestNetworkStatusDocument(unittest.TestCase): document = NetworkStatusDocumentV3(content, validate = False) self.assertEquals((authority1, authority2), document.directory_authorities) + def test_with_legacy_directory_authorities(self): + """ + Includes both normal authorities and those following the '-legacy' format. + """ + + legacy_content = "dir-source gabelmoo-legacy 81349FC1F2DBA2C2C11B45CB9706637D480AB913 212.112.245.170 212.112.245.170 80 443" + + authority1 = get_directory_authority({'contact': 'doctor jekyll'}, is_vote = False) + authority2 = DirectoryAuthority(legacy_content, validate = True, is_vote = False) + authority3 = get_directory_authority({'contact': 'mister hyde'}, is_vote = False) + + document = get_network_status_document_v3({"vote-status": "consensus"}, authorities = (authority1, authority2, authority3)) + + self.assertEquals((authority1, authority2, authority3), document.directory_authorities) + def test_authority_validation_flag_propagation(self): """ Includes invalid certificate content in an authority entry. This is testing

1 0

[stem/master] Using https link for cloning from git
by atagar＠torproject.org 10 Jan '13

10 Jan '13

commit 29af06cd5854ad70290b8066bdb1f3219831c458 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 9 21:27:41 2013 -0800 Using https link for cloning from git --- docs/download.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/download.rst b/docs/download.rst index f98672c..b047d24 100644 --- a/docs/download.rst +++ b/docs/download.rst @@ -26,7 +26,7 @@ Download For those wanting to live on the bleeding edge or contribute to stem, its git repository can be fetched with... - `git clone git://git.torproject.org/stem.git <https://gitweb.torproject.org/stem.git>`_ + `git clone https://git.torproject.org/stem.git <https://gitweb.torproject.org/stem.git>`_ * - .. image:: /_static/section/debian.png - .. image:: /_static/label/debian.png

1 0

[stem/master] Integrating pyflakes with our tests
by atagar＠torproject.org 10 Jan '13

10 Jan '13

commit 73e69ac2a612d3eef7b4a6f8efd99063ecb7babb Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 9 20:15:38 2013 -0800 Integrating pyflakes with our tests Inspired by txtorcon, using pyflakes for static error checking of our codebase. Unlike pylint it has precious few false positives for our codebase. For the false positives we do have I've added a 'pylint.ignore' config mapping so they can be whitelisted. --- run_tests.py | 16 ++++++++++++- test/check_whitespace.py | 54 +++++++++++++++++++++++++++++++++++++++++++++- test/settings.cfg | 7 ++++++ 3 files changed, 74 insertions(+), 3 deletions(-) diff --git a/run_tests.py b/run_tests.py index 35ed65d..9e6f5e1 100755 --- a/run_tests.py +++ b/run_tests.py @@ -467,18 +467,30 @@ if __name__ == '__main__': # TODO: note unused config options afterward? - base_path = os.path.sep.join(__file__.split(os.path.sep)[:-1]) + base_path = os.path.sep.join(__file__.split(os.path.sep)[:-1]).lstrip("./") style_issues = test.check_whitespace.get_issues(os.path.join(base_path, "stem")) style_issues.update(test.check_whitespace.get_issues(os.path.join(base_path, "test"))) style_issues.update(test.check_whitespace.get_issues(os.path.join(base_path, "run_tests.py"))) + # If we're doing some sort of testing (unit or integ) and pyflakes is + # available then use it. Its static checks are pretty quick so there's not + # much overhead in including it with all tests. + + if CONFIG["argument.unit"] or CONFIG["argument.integ"]: + if system.is_available("pyflakes"): + style_issues.update(test.check_whitespace.pyflakes_issues(os.path.join(base_path, "stem"))) + style_issues.update(test.check_whitespace.pyflakes_issues(os.path.join(base_path, "test"))) + style_issues.update(test.check_whitespace.pyflakes_issues(os.path.join(base_path, "run_tests.py"))) + else: + test.output.print_line("Static error checking requires pyflakes. Please install it from ...\n http://pypi.python.org/pypi/pyflakes\n", *ERROR_ATTR) + if CONFIG["argument.style"]: if system.is_available("pep8"): style_issues.update(test.check_whitespace.pep8_issues(os.path.join(base_path, "stem"))) style_issues.update(test.check_whitespace.pep8_issues(os.path.join(base_path, "test"))) style_issues.update(test.check_whitespace.pep8_issues(os.path.join(base_path, "run_tests.py"))) else: - test.output.print_line("Style checks require pep8. Please install it from 'http://pypi.python.org/pypi/pep8'.") + test.output.print_line("Style checks require pep8. Please install it from...\n http://pypi.python.org/pypi/pep8\n", *ERROR_ATTR) if style_issues: test.output.print_line("STYLE ISSUES", term.Color.BLUE, term.Attr.BOLD) diff --git a/test/check_whitespace.py b/test/check_whitespace.py index da81cae..4eca629 100644 --- a/test/check_whitespace.py +++ b/test/check_whitespace.py @@ -18,11 +18,18 @@ from __future__ import with_statement import re import os -from stem.util import system +from stem.util import conf, system # if ran directly then run over everything one level up DEFAULT_TARGET = os.path.sep.join(__file__.split(os.path.sep)[:-1]) +# mapping of files to the issues that should be ignored +PYFLAKES_IGNORE = None + +CONFIG = conf.config_dict("test", { + "pyflakes.ignore": [] +}) + def pep8_issues(base_path = DEFAULT_TARGET): """ @@ -85,6 +92,51 @@ def pep8_issues(base_path = DEFAULT_TARGET): return issues +def pyflakes_issues(base_path = DEFAULT_TARGET): + """ + Checks for issues via pyflakes. False positives can be whitelisted via our + test configuration. + + :param str base_path: directory to be iterated over + + :returns: dict of the form ``path => [(line_number, message)...]`` + """ + + global PYFLAKES_IGNORE + + if PYFLAKES_IGNORE is None: + pyflakes_ignore = {} + + for line in CONFIG["pyflakes.ignore"]: + path, issue = line.split("=>") + pyflakes_ignore.setdefault(path.strip(), []).append(issue.strip()) + + PYFLAKES_IGNORE = pyflakes_ignore + + # Pyflakes issues are of the form... + # + # FILE:LINE: ISSUE + # + # ... for instance... + # + # stem/prereq.py:73: 'long_to_bytes' imported but unused + # stem/control.py:957: undefined name 'entry' + + issues = {} + pyflakes_output = system.call("pyflakes %s" % base_path) + + for line in pyflakes_output: + line_match = re.match("^(.*):(\d+): (.*)$", line) + + if line_match: + path, line, issue = line_match.groups() + + if not issue in PYFLAKES_IGNORE.get(path, []): + issues.setdefault(path, []).append((int(line), issue)) + + return issues + + def get_issues(base_path = DEFAULT_TARGET): """ Checks python source code in the given directory for whitespace issues. diff --git a/test/settings.cfg b/test/settings.cfg index 8c85e47..401b869 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -149,3 +149,10 @@ target.torrc RUN_SOCKET => SOCKET target.torrc RUN_SCOOKIE => SOCKET, COOKIE target.torrc RUN_PTRACE => PORT, PTRACE +# False positives from pyflakes. These are mappings between the path and the +# issue. + +pyflakes.ignore stem/prereq.py => 'RSA' imported but unused +pyflakes.ignore stem/prereq.py => 'asn1' imported but unused +pyflakes.ignore stem/prereq.py => 'long_to_bytes' imported but unused +

1 0

[stem/master] Fixing issues caught by pyflakes
by atagar＠torproject.org 10 Jan '13

10 Jan '13

commit 4267b6c42a0de9546f664b7498bb3f2ca9b065b2 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 9 20:29:19 2013 -0800 Fixing issues caught by pyflakes Mostly extra imports, though in one case it caught an error (default arguments for get_server_descriptors() and get_network_statuses() would cause a NameError). --- stem/control.py | 4 ++-- stem/util/system.py | 2 +- test/check_whitespace.py | 15 --------------- test/integ/control/controller.py | 12 +++++------- test/integ/process.py | 1 - test/settings.cfg | 2 ++ test/unit/control/controller.py | 1 - .../networkstatus/directory_authority.py | 2 -- test/unit/descriptor/server_descriptor.py | 1 - test/util.py | 2 -- 10 files changed, 10 insertions(+), 32 deletions(-) diff --git a/stem/control.py b/stem/control.py index c9d215a..4d3bb52 100644 --- a/stem/control.py +++ b/stem/control.py @@ -954,7 +954,7 @@ class Controller(BaseController): if default == UNDEFINED: raise exc else: - if entry is not None: + if default is not None: for entry in default: yield entry @@ -1027,7 +1027,7 @@ class Controller(BaseController): if default == UNDEFINED: raise exc else: - if entry is not None: + if default is not None: for entry in default: yield entry diff --git a/stem/util/system.py b/stem/util/system.py index 91d0e73..a8cecd1 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -28,7 +28,7 @@ import time import stem.util.proc -from stem import UNDEFINED, CircStatus +from stem import UNDEFINED from stem.util import log # Mapping of commands to if they're available or not. diff --git a/test/check_whitespace.py b/test/check_whitespace.py index 4eca629..a6a9ead 100644 --- a/test/check_whitespace.py +++ b/test/check_whitespace.py @@ -179,21 +179,6 @@ def get_issues(base_path = DEFAULT_TARGET): file_issues.append((index + 1, "contains a windows newline")) elif content != content.rstrip(): file_issues.append((index + 1, "line has trailing whitespace")) - elif content == '': - # empty line, check its indentation against the previous and next line - # with content - - next_indent = 0 - - for future_index in xrange(index + 1, len(lines)): - future_whitespace, future_content = re.match("^(\s*)(.*)$", lines[future_index]).groups() - - if future_content: - next_indent = len(future_whitespace) - break - else: - # we had content and it's fine, making a note of its indentation - prev_indent = len(whitespace) if file_issues: issues[file_path] = file_issues diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index aba2c20..bf6b229 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -5,12 +5,10 @@ Integration tests for the stem.control.Controller class. from __future__ import with_statement import os -import re import shutil import socket import tempfile import threading -import time import unittest import stem.connection @@ -307,13 +305,13 @@ class TestController(unittest.TestCase): runner = test.runner.get_runner() with runner.get_tor_controller() as controller: - socket = controller.get_socket() + control_socket = controller.get_socket() - if isinstance(socket, stem.socket.ControlPort): - connection_value = str(socket.get_port()) + if isinstance(control_socket, stem.socket.ControlPort): + connection_value = str(control_socket.get_port()) config_key = "ControlPort" - elif isinstance(socket, stem.socket.ControlSocketFile): - connection_value = str(socket.get_socket_path()) + elif isinstance(control_socket, stem.socket.ControlSocketFile): + connection_value = str(control_socket.get_socket_path()) config_key = "ControlSocket" # successful single query diff --git a/test/integ/process.py b/test/integ/process.py index ffc4309..fb9ec9c 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -3,7 +3,6 @@ Tests the stem.process functions with various use cases. """ import os -import shutil import signal import subprocess import time diff --git a/test/settings.cfg b/test/settings.cfg index c87781f..9b58f82 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -156,4 +156,6 @@ target.torrc RUN_PTRACE => PORT, PTRACE pyflakes.ignore stem/prereq.py => 'RSA' imported but unused pyflakes.ignore stem/prereq.py => 'asn1' imported but unused pyflakes.ignore stem/prereq.py => 'long_to_bytes' imported but unused +pyflakes.ignore stem/descriptor/__init__.py => redefinition of unused 'OrderedDict' from line 33 +pyflakes.ignore test/unit/response/events.py => 'from stem import *' used; unable to detect undefined names diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index 488f397..09b0684 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -11,7 +11,6 @@ import stem.version from stem import InvalidArguments, InvalidRequest, ProtocolError from stem.control import _parse_circ_path, Controller, EventType -from stem.response import events from test import mocking diff --git a/test/unit/descriptor/networkstatus/directory_authority.py b/test/unit/descriptor/networkstatus/directory_authority.py index d116b00..eb685df 100644 --- a/test/unit/descriptor/networkstatus/directory_authority.py +++ b/test/unit/descriptor/networkstatus/directory_authority.py @@ -4,8 +4,6 @@ Unit tests for the DirectoryAuthority of stem.descriptor.networkstatus. import unittest -import test.runner - from stem.descriptor.networkstatus import DirectoryAuthority from test.mocking import get_directory_authority, get_key_certificate, AUTHORITY_HEADER diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index f455eb8..3ea4c5e 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -9,7 +9,6 @@ import unittest import stem.descriptor.server_descriptor import stem.exit_policy import stem.prereq -import test.runner from stem.descriptor.server_descriptor import RelayDescriptor, BridgeDescriptor diff --git a/test/util.py b/test/util.py index 2613bd5..4035a21 100644 --- a/test/util.py +++ b/test/util.py @@ -1,8 +1,6 @@ import socket import struct -import test.runner - from stem import ProtocolError, SocketError error_msgs = {

1 0

[stem/master] Adding a '--all' argument to the tests
by atagar＠torproject.org 10 Jan '13

10 Jan '13

commit c88e3da8c481dfc4e726a5e3d69bc19ffffddb57 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 9 20:20:28 2013 -0800 Adding a '--all' argument to the tests It'll be a whole lot easier to ask patch submitters to run 'run_tests.py --all' rather than 'run_tests.py --unit --integ --style'. :) --- run_tests.py | 10 +++++++--- test/settings.cfg | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/run_tests.py b/run_tests.py index 9e6f5e1..0edb785 100755 --- a/run_tests.py +++ b/run_tests.py @@ -69,8 +69,8 @@ import test.integ.util.proc import test.integ.util.system import test.integ.version -OPT = "uist:l:c:h" -OPT_EXPANDED = ["unit", "integ", "style", "targets=", "test=", "log=", "tor=", "config=", "help"] +OPT = "auist:l:c:h" +OPT_EXPANDED = ["all", "unit", "integ", "style", "targets=", "test=", "log=", "tor=", "config=", "help"] DIVIDER = "=" * 70 CONFIG = stem.util.conf.config_dict("test", { @@ -187,7 +187,11 @@ def load_user_configuration(test_config): arg_overrides["argument.no_color"] = "true" for opt, arg in opts: - if opt in ("-u", "--unit"): + if opt in ("-a", "--all"): + arg_overrides["argument.unit"] = "true" + arg_overrides["argument.integ"] = "true" + arg_overrides["argument.style"] = "true" + elif opt in ("-u", "--unit"): arg_overrides["argument.unit"] = "true" elif opt in ("-i", "--integ"): arg_overrides["argument.integ"] = "true" diff --git a/test/settings.cfg b/test/settings.cfg index 401b869..c87781f 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -74,6 +74,7 @@ msg.help |Usage runTests.py [OPTION] |Runs tests for the stem library. | +| -a, --all runs unit, integ, and style checks (same as '-uis') | -u, --unit runs unit tests | -i, --integ runs integration tests | -s, --style runs style checker

1 0

r25996: {website} fix the missing " causing the comments to be rendered. remov (website/trunk/press/en)
by Andrew Lewman 09 Jan '13

09 Jan '13

Author: phobos Date: 2013-01-09 21:08:37 +0000 (Wed, 09 Jan 2013) New Revision: 25996 Modified: website/trunk/press/en/press.wml Log: fix the missing " causing the comments to be rendered. remove the quick links that no one clicks on. Modified: website/trunk/press/en/press.wml =================================================================== --- website/trunk/press/en/press.wml 2013-01-09 16:57:46 UTC (rev 25995) +++ website/trunk/press/en/press.wml 2013-01-09 21:08:37 UTC (rev 25996) @@ -12,16 +12,6 @@  <h1>Tor Press and Media Information</h1> -<div class="nb"> -<h2>Quick links to better understand Tor</h2> -<ol> -<li>How is Tor <a href="<page docs/faq>#Torisdifferent">different than other proxy solutions</a>?</li> -<li><a href="../press/presskit/General-Online-Anonymity-with-Tor.pdf">Why Online Privacy and Anonymity</a>?</li> -<li><a href="../press/presskit/General-Background-on-Tor-Project-Inc.pdf">Who is the Tor Project, Inc.</a>?</li> -<li><a href="<blog>circumvention-and-anonymity">Why anonymity matters for circumvention</a>.</li> -</ol> -</div> - <h2>Media Appearances</h2> <p>Major news organizations including the New York Times, Forbes, Al Jazeera, Washington Post, Le Monde, NPR, BBC, and more have sought out @@ -53,12 +43,10 @@ <td><a href="http://www.foreignpolicy.com/articles/2012/11/26/the_fp_100_global_thinkers…">The FP Top 100 Global Thinkers</a>. Number 78: Roger, Nick, and Paul from Tor.</td> </tr> -<tr style="background-color: #e5e5e5;> +<tr style="background-color: #e5e5e5;"> <td>2012 Nov 18</td> <td>WOUB</td> -<td><a -href="http://woub.org/2012/11/18/future-cyber-security">Conversations -from Studio B: The Future of Cybersecurity</a></td> +<td><a href="http://woub.org/2012/11/18/future-cyber-security">Conversations from Studio B: The Future of Cybersecurity</a></td> </tr> <tr> <td>2012 Oct</td> @@ -1570,8 +1558,8 @@ </table> </div> -  - <div id = "sidecol"> + +<div id = "sidecol"> #include "side.wmi" #include "info.wmi" </div>

1 0

[torflow/master] Update README.BwAuthorities with TorCtl instructions
by aagbsn＠torproject.org 09 Jan '13

09 Jan '13

commit 1c3f1805dc940c63d393e708c009c8218cd9f0dc Author: aagbsn <aagbsn(a)extc.org> Date: Wed Jan 9 14:39:10 2013 +0000 Update README.BwAuthorities with TorCtl instructions --- NetworkScanners/BwAuthority/README.BwAuthorities | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/NetworkScanners/BwAuthority/README.BwAuthorities b/NetworkScanners/BwAuthority/README.BwAuthorities index bfdffde..576fead 100644 --- a/NetworkScanners/BwAuthority/README.BwAuthorities +++ b/NetworkScanners/BwAuthority/README.BwAuthorities @@ -25,6 +25,12 @@ You can test your capacity by hitting the current test server directly: The machine will require around 4-5Gbytes/day. +2. Set up TorCtl + +You can add TorCtl (pytorctl.git) as a git submodule by running the add_torctl.sh script in +the root of torflow.git. BwAuthority expects pytorctl to be checked out into the root of +torflow as TorCtl. + 3. Compile Tor for your authority and your scanner

1 0

[torflow/master] Use https, not unauthenticated git.
by aagbsn＠torproject.org 09 Jan '13

09 Jan '13

commit d97fd4561882a8dee38e3babdb11b573bc8a8d95 Author: aagbsn <aagbsn(a)extc.org> Date: Wed Jan 9 14:13:37 2013 +0000 Use https, not unauthenticated git. Thanks to weasel for spotting this --- .gitmodules | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.gitmodules b/.gitmodules index 50ffa02..7d81658 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "TorCtl"] path = TorCtl - url = git://git.torproject.org/pytorctl.git + url = https://git.torproject.org/pytorctl.git

1 0

r25995: {website} win32 expert bundle is -1. (website/trunk/include)
by Andrew Lewman 09 Jan '13

09 Jan '13

Author: phobos Date: 2013-01-09 16:57:46 +0000 (Wed, 09 Jan 2013) New Revision: 25995 Modified: website/trunk/include/versions.wmi Log: win32 expert bundle is -1. Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2013-01-09 03:47:35 UTC (rev 25994) +++ website/trunk/include/versions.wmi 2013-01-09 16:57:46 UTC (rev 25995) @@ -67,7 +67,7 @@ <define-tag version-androidbundle-libevent whitespace=delete>libevent-1.4.12-stable</define-tag> <define-tag package-androidbundle-alpha whitespace=delete>dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk</define-tag> -<define-tag package-win32-stable whitespace=delete>../dist/win32/tor-<version-win32-stable>-win32.exe</define-tag> +<define-tag package-win32-stable whitespace=delete>../dist/win32/tor-<version-win32-stable>-win32-1.exe</define-tag> <define-tag package-win32-alpha whitespace=delete>../dist/win32/tor-<version-win32-alpha>-win32.exe</define-tag> <define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.21.exe</define-tag>

1 0

r25994: {website} start updating the sponsor list for 2012/2013 (website/trunk/about/en)
by Andrew Lewman 09 Jan '13

09 Jan '13

Author: phobos Date: 2013-01-09 03:47:35 +0000 (Wed, 09 Jan 2013) New Revision: 25994 Modified: website/trunk/about/en/sponsors.wml Log: start updating the sponsor list for 2012/2013 Modified: website/trunk/about/en/sponsors.wml =================================================================== --- website/trunk/about/en/sponsors.wml 2013-01-08 19:19:29 UTC (rev 25993) +++ website/trunk/about/en/sponsors.wml 2013-01-09 03:47:35 UTC (rev 25994) @@ -19,19 +19,22 @@ <h3><i>Magnoliophyta</i> (over $1 million)</h3> <ul> - <li>An anonymous North American NGO (2008-2012)</li> - <li><a href="http://www.bbg.gov/">Broadcasting Board of Governors</a> (2006-2011)</li> + <li>An anonymous North American NGO (2008-2013)</li> + <li><a href="http://www.bbg.gov/">Broadcasting Board of Governors</a> (2006-2013)</li> </ul> <h3><i>Liliopsida</i> (up to $750k)</h3> <ul> - <li><a href="http://www.sida.se/English/">Sida - Swedish International Development Cooperation Agency</a> (2010-2012)</li> + <li><a href="http://www.sida.se/English/">Sida - Swedish International Development Cooperation Agency</a> (2010-2013)</li> </ul> <h3><i>Asparagales</i> (up to $500k)</h3> <ul> <li>Internews Europe (2006-2008)</li> <li><a href="http://nsf.gov/">National Science Foundation via Drexel University</a> (2009-2011)</li> + <li><a href="http://nsf.gov/">National Science Foundation</a> (2012-2013)</li> + <li><a href="http://www.knightfoundation.org/">The Knight Foundation</a> (2012-2013)</li> + <li><a href="http://www.rfa.org/english/">Radio Free Asia</a> (2012-2013)</li> </ul> <h3><i>Alliaceae</i> (up to $200k)</h3> @@ -43,16 +46,17 @@ <ul> <li><a href="http://www.nlnet.nl/">NLnet Foundation</a> (2008-2009)</li> <li><a href="http://www.nrl.navy.mil/">Naval Research Laboratory</a> (2006-2010)</li> - <li>An anonymous North American ISP (2009-2012)</li> + <li>An anonymous North American ISP (2009-2013)</li> </ul> <h3><i>Allium cepa</i> (up to $50k)</h3> <ul> - <li><a href="<page donate/donate>">More than 2700 personal donations from individuals like you</a> (2006-2012)</li> - <li><a href="http://code.google.com/opensource/">Google</a> (2008-2009)</li> - <li><a href="http://code.google.com/soc/">Google Summer of Code</a> (2007-2011)</li> - <li><a href="http://www.hrw.org/">Human Rights Watch</a> (2007)</li> - <li><a href="http://www.torfox.org/">Torfox</a> (2009)</li> + <li><a href="<page donate/donate>">More than 3800 personal donations from individuals like you</a> (2006-2013)</li> + <li><a href="https://www.accessnow.org/">Access Now</a> (2012-2013)</li> + <li><a href="http://code.google.com/opensource/">Google</a> (2008-2009)</li> + <li><a href="http://code.google.com/soc/">Google Summer of Code</a> (2007-2012)</li> + <li><a href="http://www.hrw.org/">Human Rights Watch</a> (2007)</li> + <li><a href="http://www.torfox.org/">Torfox</a> (2009)</li> <li><a href="http://www.shinjiru.com/">Shinjiru Technology</a> (2009-2011)</li> <li><a href="http://www.nationalchristian.com/">National Christian Foundation</a> (2010-2012)</li> </ul>

1 0