May 2017 - tor-commits - lists.torproject.org

[stem/master] Manual provided options in the wrong order
by atagar＠torproject.org 29 May '17

29 May '17

commit 3c513aaddbec6e189de1e96d59c1d320fcaa7e29 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 28 15:58:32 2017 -0700 Manual provided options in the wrong order We made an effort to provide tor's configuration options by their order in the man page, but we still used basic dicts a couple places. Ran into this due to a unit testing failure for python 3.6 where dicts seem to be ordered by default. --- stem/manual.py | 20 ++++++++++---------- test/unit/manual.py | 14 +++++++------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/stem/manual.py b/stem/manual.py index 86585a4..9287033 100644 --- a/stem/manual.py +++ b/stem/manual.py @@ -82,15 +82,15 @@ Category = stem.util.enum.Enum('GENERAL', 'CLIENT', 'RELAY', 'DIRECTORY', 'AUTHO GITWEB_MANUAL_URL = 'https://gitweb.torproject.org/tor.git/plain/doc/tor.1.txt' CACHE_PATH = os.path.join(os.path.dirname(__file__), 'cached_tor_manual.cfg') -CATEGORY_SECTIONS = { - 'GENERAL OPTIONS': Category.GENERAL, - 'CLIENT OPTIONS': Category.CLIENT, - 'SERVER OPTIONS': Category.RELAY, - 'DIRECTORY SERVER OPTIONS': Category.DIRECTORY, - 'DIRECTORY AUTHORITY SERVER OPTIONS': Category.AUTHORITY, - 'HIDDEN SERVICE OPTIONS': Category.HIDDEN_SERVICE, - 'TESTING NETWORK OPTIONS': Category.TESTING, -} +CATEGORY_SECTIONS = OrderedDict(( + ('GENERAL OPTIONS', Category.GENERAL), + ('CLIENT OPTIONS', Category.CLIENT), + ('SERVER OPTIONS', Category.RELAY), + ('DIRECTORY SERVER OPTIONS', Category.DIRECTORY), + ('DIRECTORY AUTHORITY SERVER OPTIONS', Category.AUTHORITY), + ('HIDDEN SERVICE OPTIONS', Category.HIDDEN_SERVICE), + ('TESTING NETWORK OPTIONS', Category.TESTING), +)) class ConfigOption(object): @@ -492,7 +492,7 @@ def _get_categories(content): if content and content[-1].startswith('Tor'): content = content[:-1] - categories = {} + categories = OrderedDict() category, lines = None, [] for line in content: diff --git a/test/unit/manual.py b/test/unit/manual.py index 28a8a8b..0e6a50d 100644 --- a/test/unit/manual.py +++ b/test/unit/manual.py @@ -61,13 +61,6 @@ EXPECTED_FILES = { EXPECTED_CONFIG_OPTIONS = OrderedDict() -EXPECTED_CONFIG_OPTIONS['Bridge'] = stem.manual.ConfigOption( - 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( name = 'BandwidthRate', category = 'General', @@ -89,6 +82,13 @@ EXPECTED_CONFIG_OPTIONS['MaxAdvertisedBandwidth'] = stem.manual.ConfigOption( 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.') +EXPECTED_CONFIG_OPTIONS['Bridge'] = stem.manual.ConfigOption( + 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.') + CACHED_MANUAL = None

1 0

[stem/master] Make tests pass with python 3.6
by atagar＠torproject.org 29 May '17

29 May '17

commit 39094ff4c03e5a8b3cc4f69ca9482e11c21374de Merge: 3feb659 7473972 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 28 16:11:50 2017 -0700 Make tests pass with python 3.6 To check python3 compatability I usually test with python 3.2. However, after compiling 3.6 realized it surfaced a few issues of its own. stem/manual.py | 20 ++++++++++---------- stem/util/system.py | 2 +- test/integ/interpreter.py | 2 +- test/settings.cfg | 1 + test/task.py | 3 ++- test/unit/descriptor/reader.py | 7 +++++++ test/unit/manual.py | 14 +++++++------- 7 files changed, 29 insertions(+), 20 deletions(-)

1 0

[stem/master] With python3 tempfile requires bytes input
by atagar＠torproject.org 29 May '17

29 May '17

commit 747397252a54f57f0efef3f8830b82496f1e36b8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 28 16:07:32 2017 -0700 With python3 tempfile requires bytes input Another integ test failure that manifests with python 3.6 but oddly not 3.2... ====================================================================== ERROR: test_running_file ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/require.py", line 58, in wrapped return func(self, *args, **kwargs) File "/home/atagar/Desktop/stem/test/integ/interpreter.py", line 52, in test_running_file tmp.write('GETINFO config-file\nGETINFO version') File "/home/atagar/python3.6/lib/python3.6/tempfile.py", line 483, in func_wrapper return func(*args, **kwargs) TypeError: a bytes-like object is required, not 'str' --- test/integ/interpreter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integ/interpreter.py b/test/integ/interpreter.py index 5cef051..dc8466b 100644 --- a/test/integ/interpreter.py +++ b/test/integ/interpreter.py @@ -49,7 +49,7 @@ class TestInterpreter(unittest.TestCase): ] with tempfile.NamedTemporaryFile(prefix = 'test_commands.') as tmp: - tmp.write('GETINFO config-file\nGETINFO version') + tmp.write(b'GETINFO config-file\nGETINFO version') tmp.flush() self.assertEqual(expected, _run_prompt('--run', tmp.name))

1 0

[stem/master] Fix interpreter unit tests
by atagar＠torproject.org 27 May '17

27 May '17

commit 073156e54b4f03c810ee5a0ca93df914bb3095b2 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat May 27 12:35:13 2017 -0700 Fix interpreter unit tests Oops, prior change broke one of our assertions. --- test/unit/interpreter/commands.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test/unit/interpreter/commands.py b/test/unit/interpreter/commands.py index 020b14b..717614e 100644 --- a/test/unit/interpreter/commands.py +++ b/test/unit/interpreter/commands.py @@ -91,10 +91,15 @@ class TestInterpreterCommands(unittest.TestCase): def test_when_disconnected(self): controller = Mock() - controller.is_alive.return_value = False + controller.msg.side_effect = stem.SocketClosed('kaboom!') interpreter = ControlInterpreter(controller) - self.assertRaises(stem.SocketClosed, interpreter.run_command, '/help') + + # we should be able to run non-tor commands + self.assertTrue('Interpreter commands include:' in interpreter.run_command('/help')) + + # ... but tor commands should provide exceptions + self.assertRaises(stem.SocketClosed, interpreter.run_command, 'GETINFO version') def test_quit(self): interpreter = ControlInterpreter(CONTROLLER)

1 0

[stem/master] Interpreter didn't print output of python commands
by atagar＠torproject.org 27 May '17

27 May '17

commit 502abce52a979b640bb71e580b1baa02c8705bd0 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat May 27 12:36:32 2017 -0700 Interpreter didn't print output of python commands Wtf? When did we break this? Running any python command would result in no output. Trouble was that we returned the 'output' before printing it. --- stem/interpreter/__init__.py | 2 +- stem/interpreter/commands.py | 10 +++++----- test/unit/interpreter/commands.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stem/interpreter/__init__.py b/stem/interpreter/__init__.py index b5d9c49..f4ed151 100644 --- a/stem/interpreter/__init__.py +++ b/stem/interpreter/__init__.py @@ -171,7 +171,7 @@ def main(): interpreter.run_command(user_input, print_response = True) except stem.SocketClosed as exc: if showed_close_confirmation: - print(format("Unable to run tor commands. The control connection has been closed.", *ERROR_OUTPUT)) + print(format('Unable to run tor commands. The control connection has been closed.', *ERROR_OUTPUT)) else: prompt = format("Tor's control port has closed. Do you want to continue this interpreter? (y/n) ", *HEADER_BOLD_OUTPUT) user_input = input(prompt) if stem.prereq.is_python_3() else raw_input(prompt) diff --git a/stem/interpreter/commands.py b/stem/interpreter/commands.py index 22558aa..45f2e2c 100644 --- a/stem/interpreter/commands.py +++ b/stem/interpreter/commands.py @@ -359,8 +359,7 @@ class ControlInterpreter(code.InteractiveConsole): with redirect(console_output, console_output): self.is_multiline_context = code.InteractiveConsole.push(self, command) - output = console_output.getvalue() - return output if output else None + output = console_output.getvalue().strip() else: try: output = format(self._controller.msg(command).raw_content().strip(), *STANDARD_OUTPUT) @@ -370,9 +369,10 @@ class ControlInterpreter(code.InteractiveConsole): else: output = format(str(exc), *ERROR_OUTPUT) - output += '\n' # give ourselves an extra line before the next prompt + if output: + output += '\n' # give ourselves an extra line before the next prompt - if print_response and output is not None: - print(output) + if print_response: + print(output) return output diff --git a/test/unit/interpreter/commands.py b/test/unit/interpreter/commands.py index 717614e..59ceadf 100644 --- a/test/unit/interpreter/commands.py +++ b/test/unit/interpreter/commands.py @@ -118,7 +118,7 @@ class TestInterpreterCommands(unittest.TestCase): # no received events - self.assertEqual('\n', interpreter.run_command('/events')) + self.assertEqual('', interpreter.run_command('/events')) # with enqueued events

1 0

[stem/master] Confusing error when ipv6 policy lacks a port
by atagar＠torproject.org 27 May '17

27 May '17

commit 806cbcca53091c93c7416166c09279d86c5c5b50 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat May 27 13:09:43 2017 -0700 Confusing error when ipv6 policy lacks a port Seems a bug in tor lets it accept torrc entries like... ExitPolicy reject6 [2a00:1450:4001:081e:0000:0000:0000:200e] This in turn causes us to crash with... Traceback (most recent call last): File "<console>", line 1, in <module> File "/home/atagar/Desktop/stem/stem/control.py", line 454, in wrapped return func(self, *args, **kwargs) File "/home/atagar/Desktop/stem/stem/control.py", line 1274, in get_exit_policy config_policy = stem.exit_policy.get_config_policy(policy, self.get_info('address', None)) File "/home/atagar/Desktop/stem/stem/exit_policy.py", line 156, in get_config_policy result.append(ExitPolicyRule(rule)) File "/home/atagar/Desktop/stem/stem/exit_policy.py", line 689, in __init__ self._apply_addrspec(rule, addrspec, is_ipv6_only) File "/home/atagar/Desktop/stem/stem/exit_policy.py", line 986, in _apply_addrspec raise ValueError("Address isn't a wildcard, IPv4, or IPv6 address: %s" % rule) ValueError: Address isn't a wildcard, IPv4, or IPv6 address: reject6 [2a00:1450:4001:081e:0000:0000:0000:200e] We should indeed reject it because it's missing the port from the end, but this error is confusing. Providing the error saying it isn't a 'addrspec:portspec' instead. --- stem/exit_policy.py | 4 ++-- test/unit/exit_policy/rule.py | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/stem/exit_policy.py b/stem/exit_policy.py index aaf10b0..e1469c8 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -662,7 +662,7 @@ class ExitPolicyRule(object): exitpattern = exitpattern.lstrip() - if ':' not in exitpattern: + if ':' not in exitpattern or ']' in exitpattern.rsplit(':', 1)[1]: raise ValueError("An exitpattern must be of the form 'addrspec:portspec': %s" % rule) self.address = None @@ -983,7 +983,7 @@ class ExitPolicyRule(object): else: raise ValueError("The '%s' isn't a number of bits: %s" % (addr_extra, rule)) else: - raise ValueError("Address isn't a wildcard, IPv4, or IPv6 address: %s" % rule) + raise ValueError("'%s' isn't a wildcard, IPv4, or IPv6 address: %s" % (addrspec, rule)) def _apply_portspec(self, rule, portspec): # Parses the portspec... diff --git a/test/unit/exit_policy/rule.py b/test/unit/exit_policy/rule.py index 908e72b..58c985e 100644 --- a/test/unit/exit_policy/rule.py +++ b/test/unit/exit_policy/rule.py @@ -2,6 +2,7 @@ Unit tests for the stem.exit_policy.ExitPolicyRule class. """ +import re import unittest from stem.exit_policy import AddressType, ExitPolicyRule, MicroExitPolicy @@ -381,6 +382,13 @@ class TestExitPolicyRule(unittest.TestCase): for match_args, expected_result in matches.items(): self.assertEqual(expected_result, rule.is_match(*match_args)) + def test_missing_port(self): + exc_msg = "An exitpattern must be of the form 'addrspec:portspec': accept6 192.168.0.1/0" + self.assertRaisesRegexp(ValueError, re.escape(exc_msg), ExitPolicyRule, 'accept6 192.168.0.1/0') + + exc_msg = "An exitpattern must be of the form 'addrspec:portspec': reject6 [2a00:1450:4001:081e:0000:0000:0000:200e]" + self.assertRaisesRegexp(ValueError, re.escape(exc_msg), ExitPolicyRule, 'reject6 [2a00:1450:4001:081e:0000:0000:0000:200e]') + def test_ipv6_only_entries(self): # accept6/reject6 shouldn't match anything when given an ipv4 addresses

1 0

[stem/master] Allow interpreter to continue after tor shutsdown
by atagar＠torproject.org 26 May '17

26 May '17

commit f62fc95876fa2c817b7e1aa2a57fe6bd93ef7a78 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 26 13:42:30 2017 -0700 Allow interpreter to continue after tor shutsdown When tor shuts down the next tor-prompt command immediately terminates the interpreter. This is both unnecessary and sucks. We provide more than a control connection and should let users continue to issue those commans after tor's gone. https://www.atagar.com/transfer/stem/interpreter_shutdown_prompt.png Neat idea suggested by teor... https://trac.torproject.org/projects/tor/ticket/22374 --- docs/change_log.rst | 1 + stem/interpreter/__init__.py | 13 +++++++++++++ stem/interpreter/commands.py | 3 --- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index a097f5d..a372e0c 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -72,6 +72,7 @@ The following are only available within Stem's `git repository * **Interpreter** * Added a `'--run [command or path]' argument <tutorials/down_the_rabbit_hole.html#running-individual-commands>`_ to invoke specific commands (:trac:`21541`) + * Allowing interpreter to continue after tor shutsdown (:trac:`22374`) .. _version_1.5: diff --git a/stem/interpreter/__init__.py b/stem/interpreter/__init__.py index 033d819..b5d9c49 100644 --- a/stem/interpreter/__init__.py +++ b/stem/interpreter/__init__.py @@ -124,6 +124,7 @@ def main(): readline.set_completer_delims('\n') interpreter = stem.interpreter.commands.ControlInterpreter(controller) + showed_close_confirmation = False if args.run_cmd: if args.run_cmd.upper().startswith('SETEVENTS '): @@ -168,6 +169,18 @@ def main(): prompt = '... ' if interpreter.is_multiline_context else PROMPT user_input = input(prompt) if stem.prereq.is_python_3() else raw_input(prompt) interpreter.run_command(user_input, print_response = True) + except stem.SocketClosed as exc: + if showed_close_confirmation: + print(format("Unable to run tor commands. The control connection has been closed.", *ERROR_OUTPUT)) + else: + prompt = format("Tor's control port has closed. Do you want to continue this interpreter? (y/n) ", *HEADER_BOLD_OUTPUT) + user_input = input(prompt) if stem.prereq.is_python_3() else raw_input(prompt) + print('') # blank line + + if user_input.lower() in ('y', 'yes'): + showed_close_confirmation = True + else: + break except (KeyboardInterrupt, EOFError, stem.SocketClosed) as exc: print('') # move cursor to the following line break diff --git a/stem/interpreter/commands.py b/stem/interpreter/commands.py index 4d845a0..22558aa 100644 --- a/stem/interpreter/commands.py +++ b/stem/interpreter/commands.py @@ -309,9 +309,6 @@ class ControlInterpreter(code.InteractiveConsole): :raises: **stem.SocketClosed** if the control connection has been severed """ - if not self._controller.is_alive(): - raise stem.SocketClosed() - # Commands fall into three categories: # # * Interpreter commands. These start with a '/'.

1 0

[tor/master] Cleanup MOCK_IMPL (etc) to be findable with etags
by nickm＠torproject.org 26 May '17

26 May '17

commit 6fcaf83c98df4a12149cd4b5956cd96f3e59ccfd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 26 14:05:50 2017 -0400 Cleanup MOCK_IMPL (etc) to be findable with etags A fair number of our mock_impl declarations were messed up so that even our special AM_ETAGSFLAGS couldn't find them. This should be a whitespace-only patch. --- src/common/address.c | 7 ++++--- src/common/compat.c | 3 ++- src/common/crypto.c | 6 +++--- src/common/tortls.c | 12 ++++++------ src/or/circuitlist.c | 4 ++-- src/or/control.c | 4 ++-- src/or/directory.c | 3 ++- src/or/dns.c | 4 ++-- src/or/routerlist.c | 11 ++++++----- 9 files changed, 29 insertions(+), 25 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index a6fd8c0..894e151 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1781,9 +1781,10 @@ free_interface_address6_list(smartlist_t *addrs) * Returns NULL on failure. * Use free_interface_address6_list to free the returned list. */ -MOCK_IMPL(smartlist_t *,get_interface_address6_list,(int severity, - sa_family_t family, - int include_internal)) +MOCK_IMPL(smartlist_t *, +get_interface_address6_list,(int severity, + sa_family_t family, + int include_internal)) { smartlist_t *addrs; tor_addr_t addr; diff --git a/src/common/compat.c b/src/common/compat.c index 390cff7..4f38c64 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2678,7 +2678,8 @@ static int uname_result_is_set = 0; /** Return a pointer to a description of our platform. */ -MOCK_IMPL(const char *, get_uname, (void)) +MOCK_IMPL(const char *, +get_uname,(void)) { #ifdef HAVE_UNAME struct utsname u; diff --git a/src/common/crypto.c b/src/common/crypto.c index a685101..0fc8474 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -479,7 +479,7 @@ crypto_pk_get_rsa_(crypto_pk_t *env) * private is set, include the private-key portion of the key. Return a valid * pointer on success, and NULL on failure. */ MOCK_IMPL(EVP_PKEY *, - crypto_pk_get_evp_pkey_,(crypto_pk_t *env, int private)) +crypto_pk_get_evp_pkey_,(crypto_pk_t *env, int private)) { RSA *key = NULL; EVP_PKEY *pkey = NULL; @@ -516,7 +516,7 @@ crypto_dh_get_dh_(crypto_dh_t *dh) * be set. */ MOCK_IMPL(crypto_pk_t *, - crypto_pk_new,(void)) +crypto_pk_new,(void)) { RSA *rsa; @@ -606,7 +606,7 @@ crypto_cipher_free(crypto_cipher_t *env) * Return 0 on success, -1 on failure. */ MOCK_IMPL(int, - crypto_pk_generate_key_with_bits,(crypto_pk_t *env, int bits)) +crypto_pk_generate_key_with_bits,(crypto_pk_t *env, int bits)) { tor_assert(env); diff --git a/src/common/tortls.c b/src/common/tortls.c index fadf52f..42fb91a 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -460,11 +460,11 @@ tor_x509_name_new(const char *cname) * Return a certificate on success, NULL on failure. */ MOCK_IMPL(STATIC X509 *, - tor_tls_create_certificate,(crypto_pk_t *rsa, - crypto_pk_t *rsa_sign, - const char *cname, - const char *cname_sign, - unsigned int cert_lifetime)) +tor_tls_create_certificate,(crypto_pk_t *rsa, + crypto_pk_t *rsa_sign, + const char *cname, + const char *cname_sign, + unsigned int cert_lifetime)) { /* OpenSSL generates self-signed certificates with random 64-bit serial * numbers, so let's do that too. */ @@ -662,7 +662,7 @@ tor_x509_cert_free(tor_x509_cert_t *cert) * Steals a reference to x509_cert. */ MOCK_IMPL(STATIC tor_x509_cert_t *, - tor_x509_cert_new,(X509 *x509_cert)) +tor_x509_cert_new,(X509 *x509_cert)) { tor_x509_cert_t *cert; EVP_PKEY *pkey; diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 5761890..86b0aa0 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -359,8 +359,8 @@ channel_note_destroy_pending(channel_t *chan, circid_t id) /** Called to indicate that a DESTROY is no longer pending on chan with * circuit ID id -- typically, because it has been sent. */ -MOCK_IMPL(void, channel_note_destroy_not_pending, - (channel_t *chan, circid_t id)) +MOCK_IMPL(void, +channel_note_destroy_not_pending,(channel_t *chan, circid_t id)) { circuit_t *circ = circuit_get_by_circid_channel_even_if_marked(id,chan); if (circ) { diff --git a/src/or/control.c b/src/or/control.c index 083768c..9454a7a 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -6709,8 +6709,8 @@ control_event_bootstrap(bootstrap_status_t status, int progress) * is the connection that caused this problem. */ MOCK_IMPL(void, - control_event_bootstrap_problem, (const char *warn, int reason, - or_connection_t *or_conn)) +control_event_bootstrap_problem, (const char *warn, int reason, + or_connection_t *or_conn)) { int status = bootstrap_percent; const char *tag = "", *summary = ""; diff --git a/src/or/directory.c b/src/or/directory.c index a8f9788..acd694f 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -565,7 +565,8 @@ dir_consensus_request_set_additional_headers(directory_request_t *req, * Use pds_flags as arguments to router_pick_directory_server() * or router_pick_trusteddirserver(). */ -MOCK_IMPL(void, directory_get_from_dirserver, ( +MOCK_IMPL(void, +directory_get_from_dirserver,( uint8_t dir_purpose, uint8_t router_purpose, const char *resource, diff --git a/src/or/dns.c b/src/or/dns.c index 024a21a..8a40a70 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -2086,8 +2086,8 @@ assert_cache_ok_(void) #endif -cached_resolve_t -*dns_get_cache_entry(cached_resolve_t *query) +cached_resolve_t * +dns_get_cache_entry(cached_resolve_t *query) { return HT_FIND(cache_map, &cache_root, query); } diff --git a/src/or/routerlist.c b/src/or/routerlist.c index a790265..0e45f63 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -426,8 +426,8 @@ list_sk_digests_for_authority_id, (const char *digest)) * download_status_t or NULL if none exists. */ MOCK_IMPL(download_status_t *, - download_status_for_authority_id_and_sk, - (const char *id_digest, const char *sk_digest)) +download_status_for_authority_id_and_sk,(const char *id_digest, + const char *sk_digest)) { download_status_t *dl = NULL; cert_list_t *cl = NULL; @@ -4874,9 +4874,10 @@ list_pending_fpsk_downloads(fp_pair_map_t *result) * range.) If source is given, download from source; * otherwise, download from an appropriate random directory server. */ -MOCK_IMPL(STATIC void, initiate_descriptor_downloads, - (const routerstatus_t *source, int purpose, smartlist_t *digests, - int lo, int hi, int pds_flags)) +MOCK_IMPL(STATIC void, +initiate_descriptor_downloads,(const routerstatus_t *source, + int purpose, smartlist_t *digests, + int lo, int hi, int pds_flags)) { char *resource, *cp; int digest_len, enc_digest_len;

1 0

[support-portal/master] fix torrc path
by colin＠torproject.org 26 May '17

26 May '17

commit 8de8b13fb449c613be48ff1819d95b15650fe462 Author: Colin Childs <colin(a)torproject.org> Date: Fri May 26 12:15:28 2017 -0500 fix torrc path --- plain/operator.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plain/operator.txt b/plain/operator.txt index fb18606..20f66d7 100644 --- a/plain/operator.txt +++ b/plain/operator.txt @@ -2,7 +2,7 @@ Q. How do I run a middle/guard relay on Debian? A. 1. If you're on Debian, start with "apt-get install tor" (as root). 2. Make sure your clock, date, and timezone are set correctly. Intall the ntp or openntpd (or similar) package to keep it that way. -3. Edit /etc/torrc to look like the following: +3. Edit /etc/tor/torrc to look like the following: ''' ## The IP address or hostname for incoming connections (leave commented and Tor will guess) #Address noname.example.com

1 0

[torspec/master] note that CLIENTS_SEEN is rounded; close 4688
by nickm＠torproject.org 26 May '17

26 May '17

commit c07abd047db5f8b42d5f896f394ecdc0639cdc54 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 26 10:27:34 2017 -0400 note that CLIENTS_SEEN is rounded; close 4688 --- control-spec.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/control-spec.txt b/control-spec.txt index e38daf2..1b7534a 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -2670,6 +2670,10 @@ "protocol-family=count" pairs. For example, IPVersions=v4=16,v6=40 + Note that these values are rounded, not exact. The rounding + algorithm is specified in the description of "geoip-client-origins" + in dir-spec.txt. + 4.1.15. New consensus networkstatus has arrived The syntax is:

1 0