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

[stem/master] Allow multiple spaces in exit policies
by atagar＠torproject.org 02 Jan '16

02 Jan '16

commit f7c96a68d0eac8e171f835a75fbe24e989c0e301 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 1 18:09:13 2016 -0800 Allow multiple spaces in exit policies Stem's being a little too picky here. Tor allows extra spaces in exit policies so tolerating it here too... https://trac.torproject.org/projects/tor/ticket/17942 --- stem/exit_policy.py | 8 ++++---- test/unit/exit_policy/rule.py | 10 ++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 717d856..7f238b1 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -578,10 +578,10 @@ class MicroExitPolicy(ExitPolicy): policy = policy[6:] - if not policy.startswith(' ') or (len(policy) - 1 != len(policy.lstrip())): + if not policy.startswith(' '): raise ValueError('A microdescriptor exit policy should have a space separating accept/reject from its port list: %s' % self._policy) - policy = policy[1:] + policy = policy.lstrip() # convert our port list into MicroExitPolicyRule rules = [] @@ -657,10 +657,10 @@ class ExitPolicyRule(object): exitpattern = rule[6:] - if not exitpattern.startswith(' ') or (len(exitpattern) - 1 != len(exitpattern.lstrip())): + if not exitpattern.startswith(' '): raise ValueError('An exit policy should have a space separating its accept/reject from the exit pattern: %s' % rule) - exitpattern = exitpattern[1:] + exitpattern = exitpattern.lstrip() if ':' not in exitpattern: raise ValueError("An exitpattern must be of the form 'addrspec:portspec': %s" % rule) diff --git a/test/unit/exit_policy/rule.py b/test/unit/exit_policy/rule.py index 5458c10..ecd96a8 100644 --- a/test/unit/exit_policy/rule.py +++ b/test/unit/exit_policy/rule.py @@ -4,7 +4,7 @@ Unit tests for the stem.exit_policy.ExitPolicyRule class. import unittest -from stem.exit_policy import AddressType, ExitPolicyRule +from stem.exit_policy import AddressType, ExitPolicyRule, MicroExitPolicy class TestExitPolicyRule(unittest.TestCase): @@ -15,7 +15,6 @@ class TestExitPolicyRule(unittest.TestCase): invalid_inputs = ( 'accept', 'reject', - 'accept *:*', 'accept\t*:*', 'accept\n*:*', 'acceptt *:*', @@ -29,6 +28,13 @@ class TestExitPolicyRule(unittest.TestCase): for rule_arg in invalid_inputs: self.assertRaises(ValueError, ExitPolicyRule, rule_arg) + def test_with_multiple_spaces(self): + rule = ExitPolicyRule('accept *:80') + self.assertEqual('accept *:80', str(rule)) + + policy = MicroExitPolicy('accept 80,443') + self.assertTrue(policy.can_exit_to('75.119.206.243', 80)) + def test_str_unchanged(self): # provides a series of test inputs where the str() representation should # match the input rule

1 0

[stem/master] Provide defaults for ConfigOption's constructor
by atagar＠torproject.org 02 Jan '16

02 Jan '16

commit 9b2e4c136d2a76e227b19d01811d166abebb408d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 1 16:23:46 2016 -0800 Provide defaults for ConfigOption's constructor It's handy to be able to easily make a blank ConfigOption instance. As such providing defaults for everything except its name. --- stem/manual.py | 31 +++++++++++++++++++++++++------ test/unit/manual.py | 21 +++++++++++++++------ 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/stem/manual.py b/stem/manual.py index 16325df..af7f5de 100644 --- a/stem/manual.py +++ b/stem/manual.py @@ -47,7 +47,6 @@ us what our torrc options do... .. versionadded:: 1.5.0 """ -import collections import os import shutil import sys @@ -92,18 +91,38 @@ CATEGORY_SECTIONS = { } -class ConfigOption(collections.namedtuple('ConfigOption', ['category', 'name', 'usage', 'summary', 'description'])): +class ConfigOption(object): """ Tor configuration attribute found in its torrc. + :var str name: name of the configuration option :var stem.manual.Category category: category the config option was listed under, this is Category.UNKNOWN if we didn't recognize the category - :var str name: name of the configuration option :var str usage: arguments accepted by the option :var str summary: brief description of what the option does :var str description: longer manual description with details """ + def __init__(self, name, category = Category.UNKNOWN, usage = '', summary = '', description = ''): + self.name = name + self.category = category + self.usage = usage + self.summary = summary + self.description = description + + def __eq__(self, other): + if not isinstance(other, ConfigOption): + return False + + for attr in ('name', 'category', 'usage', 'summary', 'description'): + if getattr(self, attr) != getattr(other, attr): + return False + + return True + + def __ne__(self, other): + return not self == other + @lru_cache() def _config(lowercase = True): @@ -301,8 +320,8 @@ class Manual(object): if key not in config_options: config_options[key] = ConfigOption( - conf.get('config_options.%s.category' % key, ''), conf.get('config_options.%s.name' % key, ''), + conf.get('config_options.%s.category' % key, ''), conf.get('config_options.%s.usage' % key, ''), conf.get('config_options.%s.summary' % key, ''), conf.get('config_options.%s.description' % key, '') @@ -548,7 +567,7 @@ def _add_config_options(config_options, category, lines): if line and not line.startswith(' '): if last_option: summary = _config().get('manual.summary.%s' % last_option.lower(), '') - config_options[last_option] = ConfigOption(category, last_option, usage, summary, _join_lines(description).strip()) + config_options[last_option] = ConfigOption(last_option, category, usage, summary, _join_lines(description).strip()) if ' ' in line: last_option, usage = line.split(' ', 1) @@ -564,7 +583,7 @@ def _add_config_options(config_options, category, lines): if last_option: summary = _config().get('manual.summary.%s' % last_option.lower(), '') - config_options[last_option] = ConfigOption(category, last_option, usage, summary, _join_lines(description).strip()) + config_options[last_option] = ConfigOption(last_option, category, usage, summary, _join_lines(description).strip()) def _join_lines(lines): diff --git a/test/unit/manual.py b/test/unit/manual.py index 90655d5..8711fb7 100644 --- a/test/unit/manual.py +++ b/test/unit/manual.py @@ -62,43 +62,43 @@ EXPECTED_FILES = { EXPECTED_CONFIG_OPTIONS = OrderedDict() EXPECTED_CONFIG_OPTIONS['AllowInvalidNodes'] = stem.manual.ConfigOption( - category = 'Client', name = 'AllowInvalidNodes', + category = 'Client', usage = 'entry|exit|middle|introduction|rendezvous|...', summary = 'Permits use of relays flagged as invalid by authorities', description = 'If some Tor servers are obviously not working right, the directory authorities can manually mark them as invalid, meaning that it\'s not recommended you use them for entry or exit positions in your circuits. You can opt to use them in some circuit positions, though. The default is "middle,rendezvous", and other choices are not advised.') EXPECTED_CONFIG_OPTIONS['ExcludeSingleHopRelays'] = stem.manual.ConfigOption( - category = 'Client', name = 'ExcludeSingleHopRelays', + category = 'Client', usage = '0|1', summary = 'Permits use of relays that allow single hop connections', description = 'This option controls whether circuits built by Tor will include relays with the AllowSingleHopExits flag set to true. If ExcludeSingleHopRelays is set to 0, these relays will be included. Note that these relays might be at higher risk of being seized or observed, so they are not normally included. Also note that relatively few clients turn off this option, so using these relays might make your client stand out. (Default: 1)') EXPECTED_CONFIG_OPTIONS['Bridge'] = stem.manual.ConfigOption( - category = 'Client', name = 'Bridge', + category = 'Client', usage = '[transport] IP:ORPort [fingerprint]', summary = 'Available bridges', description = 'When set along with UseBridges, instructs Tor to use the relay at "IP:ORPort" as a "bridge" relaying into the Tor network. If "fingerprint" is provided (using the same format as for DirAuthority), we will verify that the relay running at that location has the right fingerprint. We also use fingerprint to look up the bridge descriptor at the bridge authority, if it\'s provided and if UpdateBridgesFromAuthority is set too.\n\nIf "transport" is provided, and matches to a ClientTransportPlugin line, we use that pluggable transports proxy to transfer data to the bridge.') EXPECTED_CONFIG_OPTIONS['BandwidthRate'] = stem.manual.ConfigOption( - category = 'General', name = 'BandwidthRate', + category = 'General', usage = 'N bytes|KBytes|MBytes|GBytes|KBits|MBits|GBits', summary = 'Average bandwidth usage limit', description = 'A token bucket limits the average incoming bandwidth usage on this node to the specified number of bytes per second, and the average outgoing bandwidth usage to that same value. If you want to run a relay in the public network, this needs to be at the very least 75 KBytes for a relay (that is, 600 kbits) or 50 KBytes for a bridge (400 kbits) -- but of course, more is better; we recommend at least 250 KBytes (2 mbits) if possible. (Default: 1 GByte)\n\nWith this option, and in other options that take arguments in bytes, KBytes, and so on, other formats are also supported. Notably, "KBytes" can also be written as "kilobytes" or "kb"; "MBytes" can be written as "megabytes" or "MB"; "kbits" can be written as "kilobits"; and so forth. Tor also accepts "byte" and "bit" in the singular. The prefixes "tera" and "T" are also recognized. If no units are given, we default to bytes. To avoid confusion, we recommend writing "bytes" or "bits" explicitly, since it\'s easy to forge t that "B" means bytes, not bits.') EXPECTED_CONFIG_OPTIONS['BandwidthBurst'] = stem.manual.ConfigOption( - category = 'General', name = 'BandwidthBurst', + category = 'General', usage = 'N bytes|KBytes|MBytes|GBytes|KBits|MBits|GBits', summary = 'Maximum bandwidth usage limit', description = 'Limit the maximum token bucket size (also known as the burst) to the given number of bytes in each direction. (Default: 1 GByte)') EXPECTED_CONFIG_OPTIONS['MaxAdvertisedBandwidth'] = stem.manual.ConfigOption( - category = 'General', name = 'MaxAdvertisedBandwidth', + category = 'General', usage = 'N bytes|KBytes|MBytes|GBytes|KBits|MBits|GBits', summary = 'Limit for the bandwidth we advertise as being available for relaying', description = 'If set, we will not advertise more than this amount of bandwidth for our BandwidthRate. Server operators who want to reduce the number of clients who ask to build circuits through them (since this is proportional to advertised bandwidth rate) can thus reduce the CPU demands on their server without impacting network performance.') @@ -112,6 +112,15 @@ class TestManual(unittest.TestCase): self.assertFalse(stem.manual.is_important('ConstrainedSockSize')) + def test_minimal_config_option(self): + blank = stem.manual.ConfigOption('UnknownOption') + + self.assertEqual(stem.manual.Category.UNKNOWN, blank.category) + self.assertEqual('UnknownOption', blank.name) + self.assertEqual('', blank.usage) + self.assertEqual('', blank.summary) + self.assertEqual('', blank.description) + def test_parsing_with_example(self): """ Read a trimmed copy of tor's man page. This gives a good exercise of our

1 0

[webwml/master] another champion
by nickm＠torproject.org 01 Jan '16

01 Jan '16

commit b9eeb6788381d60c02f3570f14ed98132caf3881 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 1 18:20:47 2016 -0500 another champion --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 38ff2d5..fdeb8a0 100644 --- a/.htaccess +++ b/.htaccess @@ -69,6 +69,7 @@ RewriteRule ^donate/donate-blog-ellsberg(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-alison(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-snowden(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-chaos(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-blog-nanni(.*) /donate/donate$1 [R=302,L] #keep prefixes of other entries down here... RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L] diff --git a/donate/en/donate-blog-nanni.wml b/donate/en/donate-blog-nanni.wml new file mode 100644 index 0000000..e69de29

1 0

[stem/master] Deprecate is_python_27() function
by atagar＠torproject.org 01 Jan '16

01 Jan '16

commit c9852a8b183cba944aefc72462d2dcbfb88ace10 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 1 12:44:02 2016 -0800 Deprecate is_python_27() function Name is deceptive. It doesn't check that we're running python 2.7, but rather that we're simply *not* 2.6. Now that we have a private helper for that it's more straight forward to use that. --- stem/descriptor/export.py | 2 +- stem/prereq.py | 9 +++++---- test/runner.py | 2 +- test/unit/descriptor/export.py | 6 ++---- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/stem/descriptor/export.py b/stem/descriptor/export.py index f90a607..1e311a2 100644 --- a/stem/descriptor/export.py +++ b/stem/descriptor/export.py @@ -98,7 +98,7 @@ def export_csv_file(output_file, descriptors, included_fields = (), excluded_fie writer = csv.DictWriter(output_file, included_fields, dialect = _ExportDialect(), extrasaction='ignore') - if header and stem.prereq.is_python_27(): + if header and not stem.prereq._is_python_26(): writer.writeheader() for desc in descriptors: diff --git a/stem/prereq.py b/stem/prereq.py index 45c0bf5..9051b41 100644 --- a/stem/prereq.py +++ b/stem/prereq.py @@ -3,7 +3,8 @@ """ Checks for stem dependencies. We require python 2.6 or greater (including the -3.x series). Other requirements for complete functionality are... +3.x series), but note we'll be bumping our requirements to python 2.7 in stem +2.0. Other requirements for complete functionality are... * pycrypto module @@ -12,10 +13,7 @@ Checks for stem dependencies. We require python 2.6 or greater (including the :: check_requirements - checks for minimum requirements for running stem - - is_python_27 - checks if python 2.7 or later is available is_python_3 - checks if python 3.0 or later is available - is_crypto_available - checks if the pycrypto module is available """ @@ -63,6 +61,9 @@ def is_python_27(): """ Checks if we're running python 2.7 or above (including the 3.x series). + .. deprecated:: 1.5.0 + Function lacks much utility and will be eventually removed. + :returns: **True** if we meet this requirement and **False** otherwise """ diff --git a/test/runner.py b/test/runner.py index 80f390e..8793616 100644 --- a/test/runner.py +++ b/test/runner.py @@ -113,7 +113,7 @@ def skip(test_case, message): :param str message: message to skip the test with """ - if stem.prereq.is_python_27(): + if not stem.prereq._is_python_26(): test_case.skipTest(message) diff --git a/test/unit/descriptor/export.py b/test/unit/descriptor/export.py index 7e9e01b..31537c5 100644 --- a/test/unit/descriptor/export.py +++ b/test/unit/descriptor/export.py @@ -26,8 +26,7 @@ class TestExport(unittest.TestCase): Exports a single minimal tor server descriptor. """ - # we won't have a header prior to python 2.7 - if not stem.prereq.is_python_27(): + if stem.prereq._is_python_26(): test.runner.skip(self, '(header added in python 2.7)') return @@ -76,8 +75,7 @@ class TestExport(unittest.TestCase): Checks that the default attributes for our csv output doesn't include private fields. """ - # we won't have a header prior to python 2.7 - if not stem.prereq.is_python_27(): + if stem.prereq._is_python_26(): test.runner.skip(self, '(header added in python 2.7)') return

1 0

[stem/master] Skip tests requiring setUpClass() in python 2.6
by atagar＠torproject.org 01 Jan '16

01 Jan '16

commit c24f8ce2715fdb630969a8825b954456e10259c7 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 1 13:31:13 2016 -0800 Skip tests requiring setUpClass() in python 2.6 Unittest's setUpClass() function was added in python 2.7, so skipping tests that require it when running python 2.6. ====================================================================== ERROR: test_installs_all_files ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/integ/installation.py", line 74, in test_installs_all_files if self.requires_installation(): File "/home/atagar/Desktop/stem/test/integ/installation.py", line 48, in requires_installation if self.skip_reason: AttributeError: 'TestInstallation' object has no attribute 'skip_reason' ---------------------------------------------------------------------- Ran 2 tests in 0.002s FAILED (errors=2) --- test/integ/installation.py | 3 +++ test/integ/manual.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/test/integ/installation.py b/test/integ/installation.py index 986fb3c..d068d57 100644 --- a/test/integ/installation.py +++ b/test/integ/installation.py @@ -13,6 +13,9 @@ BASE_DIRECTORY = os.path.sep.join(__file__.split(os.path.sep)[:-3]) class TestInstallation(unittest.TestCase): + # TODO: remove when dropping support for python 2.6 + skip_reason = 'setUpClass() unsupported in python 2.6' + @classmethod def setUpClass(self): self.site_packages_path = None diff --git a/test/integ/manual.py b/test/integ/manual.py index 9fccb54..fc679bb 100644 --- a/test/integ/manual.py +++ b/test/integ/manual.py @@ -85,6 +85,9 @@ Policies are considered first to last, and the first match wins. If you want to class TestManual(unittest.TestCase): + # TODO: remove when dropping support for python 2.6 + skip_reason = 'setUpClass() unsupported in python 2.6' + @classmethod def setUpClass(self): self.man_path = None

1 0

[stem/master] Skip compare_flags.py test on python 2.6
by atagar＠torproject.org 01 Jan '16

01 Jan '16

commit f31ccd6fb68ba04e7c91245c648aa7c5806fbc0a Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 1 12:34:31 2016 -0800 Skip compare_flags.py test on python 2.6 An import it uses isn't available on python 2.6, so skipping the test. --- run_tests.py | 2 +- stem/prereq.py | 13 +++++++++++++ test/unit/tutorial_examples.py | 9 +++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/run_tests.py b/run_tests.py index fa56580..f446014 100755 --- a/run_tests.py +++ b/run_tests.py @@ -86,7 +86,7 @@ PEP8_TASK = Task( print_result = False, ) -if (2, 6) == sys.version_info[0:2]: +if stem.prereq._is_python_26(): def assertItemsEqual(self, expected, actual): self.assertEqual(set(expected), set(actual)) diff --git a/stem/prereq.py b/stem/prereq.py index 5ed87ef..45c0bf5 100644 --- a/stem/prereq.py +++ b/stem/prereq.py @@ -46,6 +46,19 @@ def check_requirements(): raise ImportError('stem requires python version 2.6 or greater') +def _is_python_26(): + """ + Checks if we're running python 2.6. This isn't for users as it'll be removed + in stem 2.0 (when python 2.6 support goes away). + + :returns: **True** if we're running python 2.6, **False** otherwise + """ + + major_version, minor_version = sys.version_info[0:2] + + return major_version == 2 and minor_version == 6 + + def is_python_27(): """ Checks if we're running python 2.7 or above (including the 3.x series). diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index 80a6451..3b9d1a0 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -14,6 +14,8 @@ import stem.response import stem.descriptor.remote import stem.prereq +import test.runner + from stem import str_type from stem.control import Controller from stem.descriptor.remote import DIRECTORY_AUTHORITIES @@ -240,6 +242,13 @@ class TestTutorialExamples(unittest.TestCase): @patch('stem.descriptor.remote.Query') @patch('stem.descriptor.remote.get_authorities') def test_compare_flags(self, get_authorities_mock, query_mock, stdout_mock): + if stem.prereq._is_python_26(): + # example imports OrderedDict from collections which doesn't work under + # python 2.6 + + test.runner.skip(self, "(example doesn't support python 2.6)") + return + get_authorities_mock().items.return_value = [('moria1', DIRECTORY_AUTHORITIES['moria1']), ('maatuska', DIRECTORY_AUTHORITIES['maatuska'])] fingerprint = [

1 0

[stem/master] Add missing assertItemsEqual() for python 2.6
by atagar＠torproject.org 01 Jan '16

01 Jan '16

commit c7767632e340f94052c6cfd5c2c49b02afb8ea99 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Dec 31 09:28:38 2015 -0800 Add missing assertItemsEqual() for python 2.6 Ok, that does it. Rather than avoiding use of methods on python 2.6 gonna add them when simple to do so. Since our last release we've started using assertItemsEqual. This wasn't available back then so adding it. ====================================================================== ERROR: test_votes_by_bandwidth_authorities ---------------------------------------------------------------------- Traceback (most recent call last): File "/usr/local/lib/python2.6/dist-packages/mock.py", line 1201, in patched return func(*args, **keywargs) File "/home/atagar/Desktop/stem/test/unit/tutorial_examples.py", line 311, in test_votes_by_bandwidth_authorities self.assert_equal_unordered(VOTES_BY_BANDWIDTH_AUTHORITIES_OUTPUT, stdout_mock.getvalue()) File "/home/atagar/Desktop/stem/test/unit/tutorial_examples.py", line 141, in assert_equal_unordered self.assertItemsEqual(expected.splitlines(), actual.splitlines()) AttributeError: 'TestTutorialExamples' object has no attribute 'assertItemsEqual' ---------------------------------------------------------------------- Ran 6 tests in 0.255s --- run_tests.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/run_tests.py b/run_tests.py index cbd01f0..fa56580 100755 --- a/run_tests.py +++ b/run_tests.py @@ -86,6 +86,12 @@ PEP8_TASK = Task( print_result = False, ) +if (2, 6) == sys.version_info[0:2]: + def assertItemsEqual(self, expected, actual): + self.assertEqual(set(expected), set(actual)) + + unittest.TestCase.assertItemsEqual = assertItemsEqual + def main(): start_time = time.time()

1 0

[stem/master] Fix datetime_to_unix() for python 2.6
by atagar＠torproject.org 01 Jan '16

01 Jan '16

commit 4729e7d8fac464b2c7375b0bc07ff094d549f6b4 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 1 13:24:21 2016 -0800 Fix datetime_to_unix() for python 2.6 Datetime's total_seconds() method was added in python 2.7. I'm a tad unsure why I need an hour offset for this workaround but meh. Not timezones, so guess I'm just missing some off-by-one error. ====================================================================== ERROR: test_datetime_to_unix ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/unit/util/__init__.py", line 24, in test_datetime_to_unix self.assertEqual(1344251971.0, datetime_to_unix(datetime.datetime(2012, 8, 6, 11, 19, 31))) File "/home/atagar/Desktop/stem/stem/util/__init__.py", line 37, in datetime_to_unix return (timestamp - datetime.datetime(1970, 1, 1)).total_seconds() AttributeError: 'datetime.timedelta' object has no attribute 'total_seconds' ---------------------------------------------------------------------- Ran 1 test in 0.001s FAILED (errors=1) --- stem/util/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/stem/util/__init__.py b/stem/util/__init__.py index 2ee9b9b..5f91801 100644 --- a/stem/util/__init__.py +++ b/stem/util/__init__.py @@ -7,6 +7,8 @@ Utility functions used by the stem library. import datetime +import stem.prereq + __all__ = [ 'conf', 'connection', @@ -34,4 +36,7 @@ def datetime_to_unix(timestamp): :returns: **float** for the unix timestamp of the given datetime object """ - return (timestamp - datetime.datetime(1970, 1, 1)).total_seconds() + if stem.prereq._is_python_26(): + return int(timestamp.strftime('%s')) - int(datetime.datetime(1970, 1, 1).strftime('%s')) + 3600 + else: + return (timestamp - datetime.datetime(1970, 1, 1)).total_seconds()

1 0

[stem/master] Fixing test compatibility for python 2.6
by atagar＠torproject.org 01 Jan '16

01 Jan '16

commit 356bdd30168d28f2d708ea50a530e78ff5bdd682 Merge: e9060e6 c24f8ce Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 1 13:41:21 2016 -0800 Fixing test compatibility for python 2.6 Quite a few testing issues have snuck in since our last release. Thanks to Foxboron for pointing this out! run_tests.py | 6 ++++++ stem/descriptor/export.py | 2 +- stem/prereq.py | 22 ++++++++++++++++++---- stem/util/__init__.py | 7 ++++++- test/integ/installation.py | 3 +++ test/integ/manual.py | 3 +++ test/runner.py | 2 +- test/unit/descriptor/export.py | 6 ++---- test/unit/tutorial_examples.py | 9 +++++++++ 9 files changed, 49 insertions(+), 11 deletions(-)

1 0

[torspec/master] Prop262: s/shake128/shake256/
by nickm＠torproject.org 01 Jan '16

01 Jan '16

commit 443606f0f60e98dbaab5ac4c9de4a046c06fc8a4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 31 22:31:28 2015 -0500 Prop262: s/shake128/shake256/ --- proposals/262-rekey-circuits.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/proposals/262-rekey-circuits.txt b/proposals/262-rekey-circuits.txt index ca8ad01..e7c66f8 100644 --- a/proposals/262-rekey-circuits.txt +++ b/proposals/262-rekey-circuits.txt @@ -30,10 +30,10 @@ Status: Open } const REKEY_METHOD_ACK = 0; - const REKEY_METHOD_SHAKE128_CLIENT = 1; + const REKEY_METHOD_SHAKE256_CLIENT = 1; This cell means "I am changing the key." The new key material will be - derived from SHAKE128 of the aez_key concatenated with the rekey_data + derived from SHAKE256 of the aez_key concatenated with the rekey_data field, to fill a new shake_output structure. The client should set rekey_data at random. @@ -69,8 +69,8 @@ Status: Open Each relay cipher must specify its own behavior in the presence of a REKEY cell of each type that it supports. In general, the behavior - of method 1 ("shake128-client") is "regenerate keys as if we were - calling the original KDF after a CREATE handshake, using SHAKE128 on + of method 1 ("shake256-client") is "regenerate keys as if we were + calling the original KDF after a CREATE handshake, using SHAKE256 on our current static key material and on a 32-byte random input." The behavior of any unsupported REKEY method must be to close the

1 0