February 2015 - tor-commits - lists.torproject.org

[stem/master] Integ test added
by atagar＠torproject.org 17 Feb '15

17 Feb '15

commit d59853592feda1038c540f51cfb19a45fd881387 Author: icodemachine <gauthamnekk(a)gmail.com> Date: Thu Feb 12 16:21:56 2015 +0530 Integ test added --- test/integ/util/connection.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/integ/util/connection.py b/test/integ/util/connection.py index 9bc6591..391869e 100644 --- a/test/integ/util/connection.py +++ b/test/integ/util/connection.py @@ -39,6 +39,9 @@ class TestConnection(unittest.TestCase): def test_get_connections_by_netstat(self): self.check_resolver(Resolver.NETSTAT) + def test_get_connections_by_windows_netstat(self): + self.check_resolver(Resolver.NETSTAT_WINDOWS) + def test_get_connections_by_ss(self): self.check_resolver(Resolver.SS) @@ -61,6 +64,7 @@ class TestConnection(unittest.TestCase): recognized_resolvers = ( Resolver.PROC, Resolver.NETSTAT, + Resolver.NETSTAT_WINDOWS, Resolver.SS, Resolver.LSOF, Resolver.SOCKSTAT,

1 0

[stem/master] Added Windows Support for Connection Resolver
by atagar＠torproject.org 17 Feb '15

17 Feb '15

commit 5b26c692a13d6941a7ff21ea287979f2f5e45172 Author: icodemachine <gauthamnekk(a)gmail.com> Date: Thu Feb 12 16:14:25 2015 +0530 Added Windows Support for Connection Resolver --- stem/util/connection.py | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/stem/util/connection.py b/stem/util/connection.py index b7deb7b..cf9d442 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -27,17 +27,18 @@ Connection and networking based utility functions. .. versionadded:: 1.1.0 - ================= =========== - Resolver Description - ================= =========== - **PROC** /proc contents - **NETSTAT** netstat command - **SS** ss command - **LSOF** lsof command - **SOCKSTAT** sockstat command under *nix - **BSD_SOCKSTAT** sockstat command under FreeBSD - **BSD_PROCSTAT** procstat command under FreeBSD - ================= =========== + ================= =========== + Resolver Description + ================= =========== + **PROC** /proc contents + **NETSTAT** netstat + **NETSTAT_WINDOWS** netstat command under Windows + **SS** ss command + **LSOF** lsof command + **SOCKSTAT** sockstat command under *nix + **BSD_SOCKSTAT** sockstat command under FreeBSD + **BSD_PROCSTAT** procstat command under FreeBSD + ================= =========== """ import collections @@ -63,6 +64,7 @@ LOG_CONNECTION_RESOLUTION = False Resolver = enum.Enum( ('PROC', 'proc'), ('NETSTAT', 'netstat'), + ('NETSTAT_WINDOWS', 'netstat'), ('SS', 'ss'), ('LSOF', 'lsof'), ('SOCKSTAT', 'sockstat'), @@ -91,6 +93,9 @@ RESOLVER_COMMAND = { # -n = prevents dns lookups, -p = include process Resolver.NETSTAT: 'netstat -np', + #-ano is a Windows variant for netstat including pid + Resolver.NETSTAT_WINDOWS: 'netstat -ano', + # -n = numeric ports, -p = include process, -t = tcp sockets, -u = udp sockets Resolver.SS: 'ss -nptu', @@ -112,6 +117,10 @@ RESOLVER_FILTER = { # tcp 0 586 192.168.0.1:44284 38.229.79.2:443 ESTABLISHED 15843/tor Resolver.NETSTAT: '^{protocol}\s+.*\s+{local_address}:{local_port}\s+{remote_address}:{remote_port}\s+ESTABLISHED\s+{pid}/{name}\s*$', + + # tcp 586 192.168.0.1:44284 38.229.79.2:443 ESTABLISHED 15843 + + Resolver.NETSTAT_WINDOWS: '^\s*{protocol}\s+{local_address}:{local_port}\s+{remote_address}:{remote_port}\s+ESTABLISHED\s+{pid}\s*$', # tcp ESTAB 0 0 192.168.0.20:44415 38.229.79.2:443 users:(("tor",15843,9)) Resolver.SS: '^{protocol}\s+ESTAB\s+.*\s+{local_address}:{local_port}\s+{remote_address}:{remote_port}\s+users:$\("{name}",{pid},[0-9]+$\)$', @@ -256,11 +265,11 @@ def system_resolvers(system = None): system = platform.system() if system == 'Windows': - resolvers = [] + resolvers = [Resolver.NETSTAT_WINDOWS] elif system in ('Darwin', 'OpenBSD'): resolvers = [Resolver.LSOF] elif system == 'FreeBSD': - # Netstat is available, but lacks a '-p' equivalent so we can't associate + # Netstat is available, but lacks a '-p' equivilant so we can't associate # the results to processes. The platform also has a ss command, but it # belongs to a spreadsheet application. @@ -636,4 +645,4 @@ def _cryptovariables_equal(x, y): # We renamed our methods to drop a redundant 'get_*' prefix, so alias the old # names for backward compatability. -get_system_resolvers = system_resolvers +get_system_resolvers = system_resolvers \ No newline at end of file

1 0

[tor/master] Fix some issues with reporting exit-free networks
by nickm＠torproject.org 17 Feb '15

17 Feb '15

commit 8eb3d81e6e82f056f3c733b898388b8258dc12fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 17 12:07:24 2015 -0500 Fix some issues with reporting exit-free networks Fixes bug 14918. --- changes/bug14918 | 7 +++++++ src/or/nodelist.c | 23 ++++++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/changes/bug14918 b/changes/bug14918 new file mode 100644 index 0000000..8e196cc --- /dev/null +++ b/changes/bug14918 @@ -0,0 +1,7 @@ + o Minor bugfixes (path counting): + - When deciding whether we have any exit nodes, count the number listed + in the consensus, not the number we have descriptors for. Fixes part + of bug 14918; bugfix on 0.2.6.2-alpha. + - Do not warn that we are missing directory information if we have + decided not to fetch directory information due to a long period + of idleness. Fixes part of bug 14918; bugfix on 0.2.6.2-alpha. diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 249c198..b20de81 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -1354,9 +1354,10 @@ get_dir_info_status_string(void) } /** Iterate over the servers listed in consensus, and count how many of - * them seem like ones we'd use, and how many of those we have - * descriptors for. Store the former in *num_usable and the latter in - * *num_present. + * them seem like ones we'd use (store this in *num_usable), and how + * many of those we have descriptors for (store this in + * *num_present). + * * If in_set is non-NULL, only consider those routers in in_set. * If exit_only is USABLE_DESCRIPTOR_EXIT_ONLY, only consider nodes * with the Exit flag. @@ -1409,10 +1410,11 @@ count_usable_descriptors(int *num_present, int *num_usable, } /** Return an estimate of which fraction of usable paths through the Tor - * network we have available for use. - * Count how many routers seem like ones we'd use, and how many of - * those we have descriptors for. Store the former in - * *num_usable_out and the latter in *num_present_out. + * network we have available for use. Count how many routers seem like ones + * we'd use (store this in *num_usable_out), and how many of + * those we have descriptors for (store this in + * *num_present_out.) + * * If **status_out is present, allocate a new string and print the * available percentages of guard, middle, and exit nodes to it, noting * whether there are exits in the consensus. @@ -1475,7 +1477,7 @@ compute_frac_paths_available(const networkstatus_t *consensus, * building exit paths */ /* Update our understanding of whether the consensus has exits */ consensus_path_type_t old_have_consensus_path = have_consensus_path; - have_consensus_path = ((np > 0) ? + have_consensus_path = ((nu > 0) ? CONSENSUS_PATH_EXIT : CONSENSUS_PATH_INTERNAL); @@ -1677,7 +1679,10 @@ update_router_have_minimum_dir_info(void) "can only build %d%% of likely paths. (We have %s.)", using_md?"micro":"", num_present, num_usable, (int)(paths*100), status); - log_warn(LD_NET, "%s%s", dir_info_status, suppression_msg); + if (!should_delay_dir_fetches(options, NULL) && + !directory_too_idle_to_fetch_descriptors(options, now)) { + log_warn(LD_NET, "%s%s", dir_info_status, suppression_msg); + } tor_free(suppression_msg); } tor_free(status);

1 0

[tor/master] Merge branch 'bug14918'
by nickm＠torproject.org 17 Feb '15

17 Feb '15

commit d038430a1409fbb28ea4d0b62654fc3cc7bb1f7a Merge: 9bf6da1 8eb3d81 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 17 12:49:29 2015 -0500 Merge branch 'bug14918' changes/bug14918 | 7 +++++++ src/or/nodelist.c | 23 ++++++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-)

1 0

[tor/master] Search-and-replace to regain coding style in wake of 13822.
by nickm＠torproject.org 17 Feb '15

17 Feb '15

commit 8b82f6261ea5c3fa154315f74be57710865e9a6b Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Feb 7 08:32:04 2015 -0500 Search-and-replace to regain coding style in wake of 13822. (all-caps should be reserved for global or module-global constants and --- src/or/config.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 144499e..c21c966 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3180,34 +3180,34 @@ options_validate(or_options_t *old_options, or_options_t *options, options->RelayBandwidthRate = options->RelayBandwidthBurst; if (server_mode(options)) { - const unsigned ROUTER_REQUIRED_MIN_BANDWIDTH = // tolower XXXX + const unsigned required_min_bw = public_server_mode(options) ? RELAY_REQUIRED_MIN_BANDWIDTH : BRIDGE_REQUIRED_MIN_BANDWIDTH; const char * const optbridge = public_server_mode(options) ? "" : "bridge "; - if (options->BandwidthRate < ROUTER_REQUIRED_MIN_BANDWIDTH) { + if (options->BandwidthRate < required_min_bw) { tor_asprintf(msg, "BandwidthRate is set to %d bytes/second. " "For %sservers, it must be at least %u.", (int)options->BandwidthRate, optbridge, - ROUTER_REQUIRED_MIN_BANDWIDTH); + required_min_bw); return -1; } else if (options->MaxAdvertisedBandwidth < - ROUTER_REQUIRED_MIN_BANDWIDTH/2) { + required_min_bw/2) { tor_asprintf(msg, "MaxAdvertisedBandwidth is set to %d bytes/second. " "For %sservers, it must be at least %u.", (int)options->MaxAdvertisedBandwidth, optbridge, - ROUTER_REQUIRED_MIN_BANDWIDTH/2); + required_min_bw/2); return -1; } if (options->RelayBandwidthRate && - options->RelayBandwidthRate < ROUTER_REQUIRED_MIN_BANDWIDTH) { + options->RelayBandwidthRate < required_min_bw) { tor_asprintf(msg, "RelayBandwidthRate is set to %d bytes/second. " "For %sservers, it must be at least %u.", (int)options->RelayBandwidthRate, optbridge, - ROUTER_REQUIRED_MIN_BANDWIDTH); + required_min_bw); return -1; } }

1 0

[tor/master] Split ROUTER_REQUIRED_MIN_BANDWIDTH into RELAY_ and BRIDGE_ variants
by nickm＠torproject.org 17 Feb '15

17 Feb '15

commit 4beb83095351b46dcc26e0475341d6d96ce80fc5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Feb 7 08:30:40 2015 -0500 Split ROUTER_REQUIRED_MIN_BANDWIDTH into RELAY_ and BRIDGE_ variants Also raise those minima from 20 to 75 and 50 respectively. Closes ticket 13822. --- changes/feature13822 | 5 +++++ src/or/config.c | 17 +++++++++++------ src/or/dirserv.c | 2 +- src/or/or.h | 3 ++- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/changes/feature13822 b/changes/feature13822 new file mode 100644 index 0000000..86ed0b8 --- /dev/null +++ b/changes/feature13822 @@ -0,0 +1,5 @@ + o Minor features: + - Use separate minimum bandwidth values for the configurations of + relays and bridges. Raise the minimum configured bandwidth for + bridges to 50 KiB/sec and for relays to 75 KiB/sec. (The old + values were 20 KiB/sec.) Closes ticket 13822. diff --git a/src/or/config.c b/src/or/config.c index de0baa4..144499e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3180,19 +3180,24 @@ options_validate(or_options_t *old_options, or_options_t *options, options->RelayBandwidthRate = options->RelayBandwidthBurst; if (server_mode(options)) { + const unsigned ROUTER_REQUIRED_MIN_BANDWIDTH = // tolower XXXX + public_server_mode(options) ? + RELAY_REQUIRED_MIN_BANDWIDTH : BRIDGE_REQUIRED_MIN_BANDWIDTH; + const char * const optbridge = + public_server_mode(options) ? "" : "bridge "; if (options->BandwidthRate < ROUTER_REQUIRED_MIN_BANDWIDTH) { tor_asprintf(msg, "BandwidthRate is set to %d bytes/second. " - "For servers, it must be at least %d.", - (int)options->BandwidthRate, + "For %sservers, it must be at least %u.", + (int)options->BandwidthRate, optbridge, ROUTER_REQUIRED_MIN_BANDWIDTH); return -1; } else if (options->MaxAdvertisedBandwidth < ROUTER_REQUIRED_MIN_BANDWIDTH/2) { tor_asprintf(msg, "MaxAdvertisedBandwidth is set to %d bytes/second. " - "For servers, it must be at least %d.", - (int)options->MaxAdvertisedBandwidth, + "For %sservers, it must be at least %u.", + (int)options->MaxAdvertisedBandwidth, optbridge, ROUTER_REQUIRED_MIN_BANDWIDTH/2); return -1; } @@ -3200,8 +3205,8 @@ options_validate(or_options_t *old_options, or_options_t *options, options->RelayBandwidthRate < ROUTER_REQUIRED_MIN_BANDWIDTH) { tor_asprintf(msg, "RelayBandwidthRate is set to %d bytes/second. " - "For servers, it must be at least %d.", - (int)options->RelayBandwidthRate, + "For %sservers, it must be at least %u.", + (int)options->RelayBandwidthRate, optbridge, ROUTER_REQUIRED_MIN_BANDWIDTH); return -1; } diff --git a/src/or/dirserv.c b/src/or/dirserv.c index d906195..fe8196c 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1427,7 +1427,7 @@ dirserv_compute_performance_thresholds(routerlist_t *rl, /* The 12.5th percentile bandwidth is fast. */ fast_bandwidth_kb = find_nth_uint32(bandwidths_kb, n_active, n_active/8); /* (Now bandwidths is sorted.) */ - if (fast_bandwidth_kb < ROUTER_REQUIRED_MIN_BANDWIDTH/(2 * 1000)) + if (fast_bandwidth_kb < RELAY_REQUIRED_MIN_BANDWIDTH/(2 * 1000)) fast_bandwidth_kb = bandwidths_kb[n_active/4]; guard_bandwidth_including_exits_kb = third_quartile_uint32(bandwidths_kb, n_active); diff --git a/src/or/or.h b/src/or/or.h index 520b7db..5cea06f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4937,7 +4937,8 @@ typedef struct dir_server_t { **/ } dir_server_t; -#define ROUTER_REQUIRED_MIN_BANDWIDTH (20*1024) +#define RELAY_REQUIRED_MIN_BANDWIDTH (75*1024) +#define BRIDGE_REQUIRED_MIN_BANDWIDTH (50*1024) #define ROUTER_MAX_DECLARED_BANDWIDTH INT32_MAX

1 0

[tor/master] Merge remote-tracking branch 'public/feature_13822'
by nickm＠torproject.org 17 Feb '15

17 Feb '15

commit 9bf6da1861f8cd67a40ea4f24a12d09413a8926f Merge: 1447324 8b82f62 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 17 12:34:13 2015 -0500 Merge remote-tracking branch 'public/feature_13822' changes/feature13822 | 5 +++++ src/or/config.c | 29 +++++++++++++++++------------ src/or/dirserv.c | 2 +- src/or/or.h | 3 ++- 4 files changed, 25 insertions(+), 14 deletions(-)

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 17 Feb '15

17 Feb '15

commit b77945d6424955472666fb2fa8ba15cf701895f9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 17 17:15:07 2015 +0000 Update translations for torcheck --- ca/torcheck.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ca/torcheck.po b/ca/torcheck.po index 37ab540..a02a8a4 100644 --- a/ca/torcheck.po +++ b/ca/torcheck.po @@ -3,6 +3,7 @@ # # Translators: # Albert <provisionalib(a)hotmail.com>, 2013 +# Bartges90, 2015 # David Anglada <codiobert(a)codiobert.es>, 2014 # Humbert <humbert.costas(a)gmail.com>, 2014 # laia_ <laiaadorio(a)gmail.com>, 2014 @@ -12,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-02-14 08:38+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-02-17 17:00+0000\n" +"Last-Translator: Bartges90\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +30,7 @@ msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "Visita el <a href=\\\"https://www.torproject.org/\\\">lloc web de Tor</a> per obtenir més informació de com utilitzar Tor de manera segura. Ara tens l'oportunitat de navegar per Internet anònimament." +msgstr "Visiteu el <a href=\\\"https://www.torproject.org/\\\">lloc web de Tor</a> per obtenir més informació de com utilitzar Tor de manera segura. Ara teniu l'oportunitat de navegar per Internet anònimament." msgid "There is a security update available for Tor Browser." msgstr "" @@ -37,7 +38,7 @@ msgstr "" msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "<a href=\\\"https://www.torproject.org/download/download-easy.html\\\">Clica aquí per anar a la pàgina de baixades</a>" +msgstr "<a href=\\\"https://www.torproject.org/download/download-easy.html\\\">Cliqueu aquí per anar a la pàgina de baixades</a>" msgid "Sorry. You are not using Tor." msgstr "Ho sentim. No esteu utilitzant Tor." @@ -47,7 +48,7 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "Si està intentant utilitzar el client Tor, visita el <a href=\\\"https://www.torproject.org/\\\">lloc web de Tor</a> y especificament les <a href=\\\"https://www.torproject.org/docs/faq#DoesntWork\\\">instruccions per a configurar el client Tor</a>." +msgstr "Si esteu intentant utilitzar el client Tor, visiteu el <a href=\\\"https://www.torproject.org/\\\">lloc web de Tor</a> i específicament les <a href=\\\"https://www.torproject.org/docs/faq#DoesntWork\\\">instruccions per a configurar el client Tor</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "La consulta ha fallat o s'ha rebut una resposta no esperada." @@ -78,7 +79,7 @@ msgid "Learn More »" msgstr "Més informació »" msgid "Go" -msgstr "Ves-hi" +msgstr "Vés-hi" msgid "Short User Manual" msgstr "Manual d'usuari curt"

1 0

[stem/master] Integration test to migrate from client to relay
by atagar＠torproject.org 17 Feb '15

17 Feb '15

commit 15994b2e6effe8b7637ce4c1244b404048af740b Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Feb 17 08:08:17 2015 +0100 Integration test to migrate from client to relay This helps detect Tor bug 14901. --- test/integ/control/controller.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 055955d..4fb3806 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -1228,6 +1228,25 @@ class TestController(unittest.TestCase): circuits = controller.get_circuits() self.assertTrue(new_circ in [circ.id for circ in circuits]) + def test_transition_to_relay(self): + """ + Transitions Tor to turn into a relay, then back to a client. + """ + + if test.runner.require_control(self): + return + + runner = test.runner.get_runner() + with runner.get_tor_controller() as controller: + self.assertEqual(None, controller.get_conf('OrPort')) + # DisableNetwork ensures no port is actually opened + controller.set_options({ 'OrPort': '9090', 'DisableNetwork': '1', }) + # TODO once tor 0.2.7.x exists, test that we can generate a descriptor on demand. + self.assertEqual('9090', controller.get_conf('OrPort')) + controller.reset_conf('OrPort', 'DisableNetwork') + self.assertEqual(None, controller.get_conf('OrPort')) + + def _get_router_status_entry(self, controller): """ Provides a router status entry for a relay with a nickname other than

1 0

[stem/master] Minor revisions for test_transition_to_relay()
by atagar＠torproject.org 17 Feb '15

17 Feb '15

commit dbb066053e39698300d13c0be0228d5b4e33669a Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Feb 17 08:02:42 2015 -0800 Minor revisions for test_transition_to_relay() Very, very minor tweaks... * mentioning an example of what this test is for catching * 'runner' was only used in one spot * breaking up the method a bit for readability * there was an extra newline after the method * pep8 is citing a style issue for me ("E201 E201 whitespace after '{'") --- test/integ/control/controller.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 4fb3806..4b2cbfc 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -1222,31 +1222,32 @@ class TestController(unittest.TestCase): elif test.runner.require_version(self, Requirement.EXTENDCIRCUIT_PATH_OPTIONAL): return - runner = test.runner.get_runner() - with runner.get_tor_controller() as controller: + with test.runner.get_runner().get_tor_controller() as controller: new_circ = controller.new_circuit() circuits = controller.get_circuits() self.assertTrue(new_circ in [circ.id for circ in circuits]) def test_transition_to_relay(self): """ - Transitions Tor to turn into a relay, then back to a client. + Transitions Tor to turn into a relay, then back to a client. This helps to + catch transition issues such as the one cited in :trac:`14901`. """ if test.runner.require_control(self): return - runner = test.runner.get_runner() - with runner.get_tor_controller() as controller: + with test.runner.get_runner().get_tor_controller() as controller: self.assertEqual(None, controller.get_conf('OrPort')) + # DisableNetwork ensures no port is actually opened - controller.set_options({ 'OrPort': '9090', 'DisableNetwork': '1', }) + controller.set_options({'OrPort': '9090', 'DisableNetwork': '1'}) + # TODO once tor 0.2.7.x exists, test that we can generate a descriptor on demand. + self.assertEqual('9090', controller.get_conf('OrPort')) controller.reset_conf('OrPort', 'DisableNetwork') self.assertEqual(None, controller.get_conf('OrPort')) - def _get_router_status_entry(self, controller): """ Provides a router status entry for a relay with a nickname other than

1 0