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

[stem/master] Order dependent unit test failure
by atagar＠torproject.org 22 Jan '19

22 Jan '19

commit 6618180b2e5be525cc451b3f745caf4b0dd51527 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 21 11:49:25 2019 -0800 Order dependent unit test failure Though these passed for me a few times for me undefinied ordering finally caught up with me. Simple to fix. Correcting some pydocs too. ====================================================================== FAIL: test_new_header_attribute ---------------------------------------------------------------------- Traceback (most recent call last): File "/usr/lib/python3.5/unittest/mock.py", line 1157, in patched return func(*args, **keywargs) File "/home/atagar/Desktop/stem/test/unit/descriptor/bandwidth_file.py", line 162, in test_new_header_attribute self.assertEqual(EXPECTED_NEW_HEADER_CONTENT, str(desc)) AssertionError: '1410723598\nversion=1.1.0\nnew_header=neat stuff\n=====' != '1410723598\nnew_header=neat stuff\nversion=1.1.0\n=====' 1410723598 + new_header=neat stuff version=1.1.0 - new_header=neat stuff ===== ---------------------------------------------------------------------- --- stem/descriptor/__init__.py | 18 ++++++++++++------ stem/descriptor/bandwidth_file.py | 10 ++++++++-- stem/util/__init__.py | 2 ++ test/unit/descriptor/bandwidth_file.py | 18 ++++++++++++------ 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index f926c45a..005830be 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -9,11 +9,14 @@ Package for parsing and processing descriptor data. :: parse_file - Parses the descriptors in a file. - create - Creates a new custom descriptor. create_signing_key - Cretes a signing key that can be used for creating descriptors. Descriptor - Common parent for all descriptor file types. - |- from_str - provides a parsed descriptor for the given string + | |- content - creates the text of a new descriptor + | |- create - creates a new descriptor + | +- from_str - provides a parsed descriptor for the given string + | + |- type_annotation - provides our @type annotation |- get_path - location of the descriptor on disk if it came from a file |- get_archive_path - location of the descriptor within the archive it came from |- get_bytes - similar to str(), but provides our original bytes content @@ -109,17 +112,20 @@ except ImportError: __all__ = [ 'bandwidth_file', + 'certificate', 'export', - 'reader', - 'remote', 'extrainfo_descriptor', - 'server_descriptor', + 'hidden_service_descriptor', 'microdescriptor', 'networkstatus', + 'reader', + 'remote', 'router_status_entry', + 'server_descriptor', 'tordnsel', - 'parse_file', + 'Descriptor', + 'parse_file', ] UNSEEKABLE_MSG = """\ diff --git a/stem/descriptor/bandwidth_file.py b/stem/descriptor/bandwidth_file.py index b51e9f82..78e2d05e 100644 --- a/stem/descriptor/bandwidth_file.py +++ b/stem/descriptor/bandwidth_file.py @@ -25,6 +25,12 @@ from stem.descriptor import ( Descriptor, ) +try: + # added in python 2.7 + from collections import OrderedDict +except ImportError: + from stem.util.ordereddict import OrderedDict + HEADER_DIV = b'=====' @@ -91,7 +97,7 @@ def _parse_file(descriptor_file, validate = False, **kwargs): def _parse_header(descriptor, entries): - header = {} + header = OrderedDict() content = io.BytesIO(descriptor.get_bytes()) content.readline() # skip the first line, which should be the timestamp @@ -226,7 +232,7 @@ class BandwidthFile(Descriptor): if sign: raise NotImplementedError('Signing of %s not implemented' % cls.__name__) - header = dict(attr) if attr is not None else {} + header = OrderedDict(attr) if attr is not None else OrderedDict() timestamp = header.pop('timestamp', str(int(time.time()))) content = header.pop('content', []) version = header.get('version', HEADER_DEFAULT.get('version')) diff --git a/stem/util/__init__.py b/stem/util/__init__.py index 7fff7dbe..bff894dc 100644 --- a/stem/util/__init__.py +++ b/stem/util/__init__.py @@ -17,10 +17,12 @@ __all__ = [ 'lru_cache', 'ordereddict', 'proc', + 'str_tools', 'system', 'term', 'test_tools', 'tor_tools', + 'datetime_to_unix', ] diff --git a/test/unit/descriptor/bandwidth_file.py b/test/unit/descriptor/bandwidth_file.py index 003f9fe8..6150a7e7 100644 --- a/test/unit/descriptor/bandwidth_file.py +++ b/test/unit/descriptor/bandwidth_file.py @@ -11,6 +11,12 @@ from stem.descriptor.bandwidth_file import BandwidthFile from test.unit.descriptor import get_resource try: + # added in python 2.7 + from collections import OrderedDict +except ImportError: + from stem.util.ordereddict import OrderedDict + +try: # added in python 3.3 from unittest.mock import Mock, patch except ImportError: @@ -144,11 +150,11 @@ class TestBandwidthFile(unittest.TestCase): Exercise the example in our content method's pydoc. """ - content = BandwidthFile.content({ - 'timestamp': '12345', - 'version': '1.2.0', - 'content': [], - }) + content = BandwidthFile.content(OrderedDict([ + ('timestamp', '12345'), + ('version', '1.2.0'), + ('content', []), + ])) self.assertEqual(b'12345\nversion=1.2.0\n=====', content) @@ -158,7 +164,7 @@ class TestBandwidthFile(unittest.TestCase): Include an unrecognized header field. """ - desc = BandwidthFile.create({'version': '1.1.0', 'new_header': 'neat stuff'}) + desc = BandwidthFile.create(OrderedDict([('version', '1.1.0'), ('new_header', 'neat stuff')])) self.assertEqual(EXPECTED_NEW_HEADER_CONTENT, str(desc)) self.assertEqual('1.1.0', desc.version) self.assertEqual({'version': '1.1.0', 'new_header': 'neat stuff'}, desc.header)

1 0

[stem/master] Bandwidth file parsing fixes
by atagar＠torproject.org 22 Jan '19

22 Jan '19

commit bc7975b2a9317f65752f8781537e88e6a6bd9db1 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 22 10:40:06 2019 -0800 Bandwidth file parsing fixes Code review issues caught by teor (thanks!)... https://github.com/torproject/stem/commit/9cac9085504230e036ff65754d88a349a… https://trac.torproject.org/projects/tor/ticket/29056#comment:16 Most notably sbws originally used four character header dividers. Tor expected five so sbws changed, but for backward compatability both are allowed. --- stem/descriptor/bandwidth_file.py | 18 +++++++++++------- test/unit/descriptor/bandwidth_file.py | 16 ++++++++++++++-- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/stem/descriptor/bandwidth_file.py b/stem/descriptor/bandwidth_file.py index 78e2d05e..dfe8377b 100644 --- a/stem/descriptor/bandwidth_file.py +++ b/stem/descriptor/bandwidth_file.py @@ -31,10 +31,14 @@ try: except ImportError: from stem.util.ordereddict import OrderedDict +# Four character dividers are allowed for backward compatability, but five is +# preferred. + HEADER_DIV = b'=====' +HEADER_DIV_ALT = b'====' -# Converters header attributes to a given type. Malformed fields should be +# Converts header attributes to a given type. Malformed fields should be # ignored according to the spec. def _str(val): @@ -107,10 +111,10 @@ def _parse_header(descriptor, entries): if not line: break # end of the content - elif line == HEADER_DIV: + elif line in (HEADER_DIV, HEADER_DIV_ALT): break # end of header - elif line.startswith(b'node_id='): - break # version 1.0 measurement + elif not header and 'node_id=' in line: + break # version 1.0 doesn't have any headers if b'=' in line: key, value = stem.util.str_tools._to_unicode(line).split('=', 1) @@ -142,7 +146,7 @@ def _parse_body(descriptor, entries): if descriptor.version == '1.0.0': content.readline() # skip the first line else: - while content.readline().strip() != HEADER_DIV: + while content.readline().strip() not in ('', HEADER_DIV, HEADER_DIV_ALT): pass # skip the header measurements = {} @@ -168,7 +172,7 @@ def _parse_body(descriptor, entries): class BandwidthFile(Descriptor): """ - Tor bandwidth authroity measurements. + Tor bandwidth authority measurements. :var dict measurements: **\*** mapping of relay fingerprints to their bandwidth measurement metadata @@ -195,7 +199,7 @@ class BandwidthFile(Descriptor): a default value, others are left as **None** if undefined """ - TYPE_ANNOTATION_NAME = 'badnwidth-file' # TODO: needs an official @type, https://trac.torproject.org/projects/tor/ticket/28615 + TYPE_ANNOTATION_NAME = 'bandwidth-file' # TODO: needs an official @type, https://trac.torproject.org/projects/tor/ticket/28615 ATTRIBUTES = { 'timestamp': (None, _parse_timestamp), diff --git a/test/unit/descriptor/bandwidth_file.py b/test/unit/descriptor/bandwidth_file.py index 6150a7e7..5e75514c 100644 --- a/test/unit/descriptor/bandwidth_file.py +++ b/test/unit/descriptor/bandwidth_file.py @@ -66,7 +66,7 @@ class TestBandwidthFile(unittest.TestCase): Parse version 1.0 formatted files. """ - desc = list(stem.descriptor.parse_file(get_resource('bandwidth_file_v1.0'), 'badnwidth-file 1.0'))[0] + desc = list(stem.descriptor.parse_file(get_resource('bandwidth_file_v1.0'), 'bandwidth-file 1.0'))[0] self.assertEqual(datetime.datetime(2019, 1, 14, 17, 41, 29), desc.timestamp) self.assertEqual('1.0.0', desc.version) @@ -93,7 +93,7 @@ class TestBandwidthFile(unittest.TestCase): Parse version 1.2 formatted files. """ - desc = list(stem.descriptor.parse_file(get_resource('bandwidth_file_v1.2'), 'badnwidth-file 1.2'))[0] + desc = list(stem.descriptor.parse_file(get_resource('bandwidth_file_v1.2'), 'bandwidth-file 1.2'))[0] self.assertEqual(datetime.datetime(2019, 1, 14, 5, 34, 59), desc.timestamp) self.assertEqual('1.2.0', desc.version) @@ -176,6 +176,18 @@ class TestBandwidthFile(unittest.TestCase): self.assertRaisesWith(ValueError, 'Headers require BandwidthFile version 1.1 or later', BandwidthFile.create, {'new_header': 'neat stuff'}) + def test_header_alternate_div(self): + """ + To support backward compatability four character dividers are allowed. + """ + + with open(get_resource('bandwidth_file_v1.2')) as desc_file: + desc = BandwidthFile.from_str(desc_file.read().replace('=====', '====')) + + self.assertEqual(datetime.datetime(2019, 1, 14, 5, 34, 59), desc.timestamp) + self.assertEqual('1.2.0', desc.version) + self.assertEqual(81, len(desc.measurements)) + def test_invalid_timestamp(self): """ Invalid timestamp values.

1 0

[snowflake/master] Bump last updated date.
by dcf＠torproject.org 22 Jan '19

22 Jan '19

commit bf82ef519230682820edefa1cd4f64262b4ce5aa Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jan 22 11:26:45 2019 -0700 Bump last updated date. --- proxy/static/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/static/index.html b/proxy/static/index.html index cfe8d89..2eb7bd1 100644 --- a/proxy/static/index.html +++ b/proxy/static/index.html @@ -127,7 +127,7 @@ href="https://gitweb.torproject.org/pluggable-transports/snowflake.git/"> gitweb.torproject.org/pluggable-transports/snowflake.git </a> <br/> -Last update: <time>2018-12-20</time> +Last update: <time>2019-01-22</time> <script>

1 0

[snowflake/master] Move the Yes/No buttons into index.html; redirect options.html to it.
by dcf＠torproject.org 22 Jan '19

22 Jan '19

commit 627f37e00485fc87b790418f7edba8fb0c7bfd28 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Dec 20 17:22:36 2018 -0700 Move the Yes/No buttons into index.html; redirect options.html to it. --- proxy/static/.htaccess | 1 + proxy/static/embed.html | 2 +- proxy/static/index.html | 106 ++++++++++++++++++++++++++++++++++ proxy/static/options.html | 143 ---------------------------------------------- 4 files changed, 108 insertions(+), 144 deletions(-) diff --git a/proxy/static/.htaccess b/proxy/static/.htaccess index f733194..3dd217d 100644 --- a/proxy/static/.htaccess +++ b/proxy/static/.htaccess @@ -1,3 +1,4 @@ <Files "embed.html"> Header always unset X-Frame-Options </Files> +Redirect permanent /options.html /index.html diff --git a/proxy/static/embed.html b/proxy/static/embed.html index 65303b5..9efe369 100644 --- a/proxy/static/embed.html +++ b/proxy/static/embed.html @@ -44,7 +44,7 @@ </style> </head> <body> - <a target="_blank" href="options.html"> + <a target="_blank" href="index.html"> <div id="badge"> Internet Freedom </div> diff --git a/proxy/static/index.html b/proxy/static/index.html index 74779e5..cfe8d89 100644 --- a/proxy/static/index.html +++ b/proxy/static/index.html @@ -17,6 +17,18 @@ textarea { resize: none; padding: 1em; } +#options { + background-color: rgba(0,0,0,0.8); + color: #fff; + resize: none; + position: relative; border: none; + width: 30rem; + padding: 3rem; margin: auto; margin-top: 1rem; + cursor: default; +} +#options .active { + color: #2F2 !important; +} </style> </head> @@ -30,6 +42,49 @@ is a WebRTC pluggable transport for Tor. </p> <p> +This page enables you to use your web browser as a proxy to help other +Internet users in censored places. +When you click yes, your browser will act as a +censorship circumvention proxy +as long as you are viewing a page with the snowflake badge. +</p> + +<div id='options'> + +<noscript> +<hr/> +Snowflake proxy requires javascript. +<br/> +To volunteer as a proxy, please enable javascript. +</noscript> + +<div id='buttons' style='display:none'> +<p> +Do you want your browser to act as a proxy? +</p> + +<p> +<button onclick="enableSnowflake()"> + Yes +</button> +<button onclick="disableSnowflake()"> + No +</button> +</p> +<div id="snowflake-status"></div> +</div> + +<div id='cookies-disabled' style='display:none'> +<hr/> +<p> +Your browser has cookies disabled. You will need to enable them in order +to set Snowflake preferences. +</p> +</div> + +</div> + +<p> Minimum functionality has been achieved, and it is possible to bootstrap a Tor client to 100% using Snowflake, and the browsing experience using this PT is reasonable enough. @@ -74,5 +129,56 @@ gitweb.torproject.org/pluggable-transports/snowflake.git <br/> Last update: <time>2018-12-20</time> +<script> + +// Defaults to opt-in. +var COOKIE_NAME = "snowflake-allow"; +var COOKIE_LIFETIME = "Thu, 01 Jan 2038 00:00:00 GMT"; + +function readCookie(cookie) { + c = document.cookie.split('; '); + cookies = {}; + for (i = 0 ; i < c.length ; i++) { + pair = c[i].split('='); + cookies[pair[0]] = pair[1]; + } + return cookies[cookie]; +} + +function enableSnowflake() { + setSnowflakeCookie(1); + location.reload(); +} + +function disableSnowflake() { + setSnowflakeCookie(0); + location.reload(); +} + +function setSnowflakeCookie(val) { + document.cookie = COOKIE_NAME + "=" + val + ";path=/ ;expires=" + COOKIE_LIFETIME; +} + +window.onload = function() { + if (navigator.cookieEnabled) { + // Both JS and cookies enabled -- display normal buttons. + document.getElementById('buttons').style = ''; + } else { + // Display the cookies disabled message if necessary. + document.getElementById('cookies-disabled').style = ''; + } + var enabled = readCookie(COOKIE_NAME); + var $status = document.getElementById('snowflake-status'); + if ("1" === enabled) { + $status.innerHTML = 'Snowflake Proxy is ACTIVE <br/><br/>' + + 'Thank you for contributing to internet freedom!'; + $status.className = 'active'; + } else { + $status.innerHTML = 'Snowflake Proxy is OFF'; + $status.className = ''; + } +} +</script> + </body> </html> diff --git a/proxy/static/options.html b/proxy/static/options.html deleted file mode 100644 index bdffd51..0000000 --- a/proxy/static/options.html +++ /dev/null @@ -1,143 +0,0 @@ -<!doctype html> -<html> -<head> - <meta content="text/html;charset=utf-8" http-equiv="Content-Type"> - <title>Snowflake - Options</title> - <style> - * { - box-sizing: border-box; - -webkit-transition: all 0.3s; - -moz-transition: all 0.3s; - transition: all 0.3s; - } - body { - position: absolute; - width: 100%; height: 100%; top: 0; margin: 0 auto; - background-color: #424; - color: #000; - font-size: 1rem; - text-align: center; - font-family: monospace; - background-image: url('koch.jpg'); - } - .options { - background-color: rgba(0,0,0,0.8); - color: #fff; - resize: none; - position: relative; border: none; - width: 30rem; min-width: 40em; - padding: 3rem; margin: auto; margin-top: 1rem; - cursor: default; - } - a { color: #88F; } a:hover { color: #fff; } - #snowflake-status { - color: #888; - } - .active { - color: #2F2 !important; - } - </style> -</head> -<body> - <div class="options"> - <h1>Snowflake Options</h1> - <p> - This page enables you to use your web browser as a proxy to help other - Internet users in censored places. - When you click yes, your browser will act as a - censorship circumvention proxy - as long as you are viewing a page with the snowflake badge. - </p> - - <p> - For more information on this system click - <a href="https://snowflake.torproject.org/">here</a>. - </p> - - <noscript> - <hr/> - Snowflake proxy requires javascript. - <br/> - To volunteer as a proxy, please enable javascript. - </noscript> - - <div id='buttons' style='display:none'> - <p> - Do you want your browser to act as a proxy? - </p> - - <p> - <button onclick="enableSnowflake()"> - Yes - </button> - <button onclick="disableSnowflake()"> - No - </button> - </p> - <div id="snowflake-status"></div> - </div> - - <div id='cookies-disabled' style='display:none'> - <hr/> - <p> - Your browser has cookies disabled. You will need to enable them in order - to set Snowflake preferences. - </p> - </div> - -<script> - -// Defaults to opt-in. -var COOKIE_NAME = "snowflake-allow"; -var COOKIE_LIFETIME = "Thu, 01 Jan 2038 00:00:00 GMT"; - -function readCookie(cookie) { - c = document.cookie.split('; '); - cookies = {}; - for (i = 0 ; i < c.length ; i++) { - pair = c[i].split('='); - cookies[pair[0]] = pair[1]; - } - return cookies[cookie]; -} - -function enableSnowflake() { - setSnowflakeCookie(1); - refreshStatus(); -} - -function disableSnowflake() { - setSnowflakeCookie(0); - refreshStatus(); -} - -function setSnowflakeCookie(val) { - document.cookie = COOKIE_NAME + "=" + val + ";path=/ ;expires=" + COOKIE_LIFETIME; -} - -function refreshStatus() { - var enabled = readCookie(COOKIE_NAME); - var $status = document.getElementById('snowflake-status'); - if ("1" === enabled) { - $status.innerHTML = 'Snowflake Proxy is ACTIVE <br/><br/>' + - 'Thank you for contributing to internet freedom!'; - $status.className = 'active'; - } else { - $status.innerHTML = 'Snowflake Proxy is OFF'; - $status.className = ''; - } -} - -window.onload = function() { - if (navigator.cookieEnabled) { - // Both JS and cookies enabled -- display normal buttons. - document.getElementById('buttons').style = ''; - } else { - // Display the cookies disabled message if necessary. - document.getElementById('cookies-disabled').style = ''; - } - refreshStatus(); -} -</script> -</body> -</html>

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 22 Jan '19

22 Jan '19

commit e65d645a7b6a9ba87b2d5f1f08d7eb50a401bd22 Merge: 8c6fcf864 d9fde8760 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 22 12:27:50 2019 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug29042 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.3.5] correct bug number in 29042 changelog
by nickm＠torproject.org 22 Jan '19

22 Jan '19

commit d9fde87607aa11a9d542f91cd0fa352ea989174f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 22 12:27:46 2019 -0500 correct bug number in 29042 changelog --- changes/bug29042 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug29042 b/changes/bug29042 index ecbcdeeec..8d76939ce 100644 --- a/changes/bug29042 +++ b/changes/bug29042 @@ -2,4 +2,4 @@ - Log more information at "warning" level when unable to read a private key; log more information ad "info" level when unable to read a public key. We had warnings here before, but they were lost during our - NSS work. Fixes bug 28981; bugfix on 0.3.5.1-alpha. + NSS work. Fixes bug 29042; bugfix on 0.3.5.1-alpha.

1 0

[tor/master] correct bug number in 29042 changelog
by nickm＠torproject.org 22 Jan '19

22 Jan '19

commit d9fde87607aa11a9d542f91cd0fa352ea989174f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 22 12:27:46 2019 -0500 correct bug number in 29042 changelog --- changes/bug29042 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug29042 b/changes/bug29042 index ecbcdeeec..8d76939ce 100644 --- a/changes/bug29042 +++ b/changes/bug29042 @@ -2,4 +2,4 @@ - Log more information at "warning" level when unable to read a private key; log more information ad "info" level when unable to read a public key. We had warnings here before, but they were lost during our - NSS work. Fixes bug 28981; bugfix on 0.3.5.1-alpha. + NSS work. Fixes bug 29042; bugfix on 0.3.5.1-alpha.

1 0

[tor/maint-0.3.5] correct bug number in 29042 changelog
by nickm＠torproject.org 22 Jan '19

22 Jan '19

commit d9fde87607aa11a9d542f91cd0fa352ea989174f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 22 12:27:46 2019 -0500 correct bug number in 29042 changelog --- changes/bug29042 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug29042 b/changes/bug29042 index ecbcdeeec..8d76939ce 100644 --- a/changes/bug29042 +++ b/changes/bug29042 @@ -2,4 +2,4 @@ - Log more information at "warning" level when unable to read a private key; log more information ad "info" level when unable to read a public key. We had warnings here before, but they were lost during our - NSS work. Fixes bug 28981; bugfix on 0.3.5.1-alpha. + NSS work. Fixes bug 29042; bugfix on 0.3.5.1-alpha.

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 22 Jan '19

22 Jan '19

commit 74e41155ffc3e295322904b5c85179db538d91f8 Merge: 21dd3ece6 d9fde8760 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 22 12:27:50 2019 -0500 Merge branch 'maint-0.3.5' changes/bug29042 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'bug29042_035' into maint-0.3.5
by nickm＠torproject.org 22 Jan '19

22 Jan '19

commit 4159d103d644101ab616973c9f7742821132ecbd Merge: 9ce1978b5 0981ac4c5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 22 11:55:53 2019 -0500 Merge branch 'bug29042_035' into maint-0.3.5 changes/bug29042 | 5 +++++ src/lib/crypt_ops/crypto_rsa.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 31 insertions(+), 8 deletions(-)

1 0