- tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.2.7'
by nickm＠torproject.org 23 Dec '15

23 Dec '15

commit ff3e90070fd21788ac2c1c9116f18c9b888c750a Merge: b9596b8 d0c209c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 22 20:38:33 2015 -0500 Merge branch 'maint-0.2.7' changes/bug17923 | 4 ++++ configure.ac | 1 - 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.7] Remove extraneous #endif in configure.ac
by nickm＠torproject.org 23 Dec '15

23 Dec '15

commit d0c209c51d856ee78cca1e4ee337d10155a93916 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 22 20:37:02 2015 -0500 Remove extraneous #endif in configure.ac This will fix the detection of struct in6_addr.s6_addr32 and others Found and fixed by cypherpunks; bug 17923; bugfix on f948caad7b5bd --- changes/bug17923 | 4 ++++ configure.ac | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug17923 b/changes/bug17923 new file mode 100644 index 0000000..48026a5 --- /dev/null +++ b/changes/bug17923 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Add an #endif to configure.ac so that we correctly detect + the presence of in6_addr.s6_addr32. Fixes bug 17923; bugfix on + 0.2.0.13-alpha. diff --git a/configure.ac b/configure.ac index 2f75568..bf6d7f6 100644 --- a/configure.ac +++ b/configure.ac @@ -1130,7 +1130,6 @@ AC_CHECK_MEMBERS([struct in6_addr.s6_addr32, struct in6_addr.s6_addr16, struct s #include <winsock2.h> #include <ws2tcpip.h> #endif -#endif ]) AC_CHECK_TYPES([rlim_t], , ,

1 0

[stem/master] Revert "Controller method for getting custom config options"
by atagar＠torproject.org 22 Dec '15

22 Dec '15

commit a4b5f9fd39e927f5d92eb1c489601d4889af3870 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Dec 22 09:55:21 2015 -0800 Revert "Controller method for getting custom config options" Well... damn. Just realized a better option for the purposes I wrote this method for. Still might do something like this in the future but for now lets not expand our Controller. It already has too many methods. :) --- docs/change_log.rst | 1 - stem/control.py | 48 -------------------------------------- test/integ/control/controller.py | 20 ---------------- 3 files changed, 69 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 39d109c..87ea053 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -48,7 +48,6 @@ The following are only available within Stem's `git repository * Added `stem.manual <api/manual.html>`_, which provides information available about Tor from `its manual <https://www.torproject.org/docs/tor-manual.html.en>`_ (:trac:`8251`) * :func:`~stem.connection.connect` and :func:`~stem.control.Controller.from_port` now connect to both port 9051 (relay's default) and 9151 (Tor Browser's default) (:trac:`16075`) * Added `support for NETWORK_LIVENESS events <api/response.html#stem.response.events.NetworkLivenessEvent>`_ (:spec:`44aac63`) - * Added :func:`~stem.control.Controller.get_custom_conf` to the :class:`~stem.control.Controller` * Added :func:`~stem.control.Controller.is_user_traffic_allowed` to the :class:`~stem.control.Controller` * Added the replica attribute to the :class:`~stem.response.events.HSDescEvent` (:spec:`4989e73`) * IPv6 addresses could trigger errors in :func:`~stem.control.Controller.get_listeners`, :class:`~stem.response.events.ORConnEvent`, and quite a few other things (:trac:`16174`) diff --git a/stem/control.py b/stem/control.py index 91c607e..3b1edfa 100644 --- a/stem/control.py +++ b/stem/control.py @@ -93,7 +93,6 @@ If you're fine with allowing your script to raise exceptions then this can be mo | |- get_conf - gets the value of a configuration option |- get_conf_map - gets the values of multiple configuration options - |- get_custom_conf - provides configuration options that differ from their defaults |- set_conf - sets the value of a configuration option |- reset_conf - reverts configuration options to their default values |- set_options - sets or resets the values of multiple configuration options @@ -1987,8 +1986,6 @@ class Controller(BaseController): def get_conf(self, param, default = UNDEFINED, multiple = False): """ - get_conf(param, default = UNDEFINED, multiple = False) - Queries the current value for a configuration option. Some configuration options (like the ExitPolicy) can have multiple values. This provides a **list** with all of the values if **multiple** is **True**. Otherwise this @@ -2036,8 +2033,6 @@ class Controller(BaseController): def get_conf_map(self, params, default = UNDEFINED, multiple = True): """ - get_conf_map(params, default = UNDEFINED, multiple = True) - Similar to :func:`~stem.control.Controller.get_conf` but queries multiple configuration options, providing back a mapping of those options to their values. @@ -2175,49 +2170,6 @@ class Controller(BaseController): return return_dict - @with_default() - def get_custom_conf(self, default = UNDEFINED, include_values = False): - """ - get_custom_conf(params, default = UNDEFINED, multiple = True) - - Provides tor configuration options that differ from their defaults. - - .. versionadded:: 1.5.0 - - :param object default: response if the query fails - :param bool include_values: provides full configuration lines that can be - saved, similar to 'GETINFO config-text' - - :returns: **list** of configuration options that have been set, or config - lines if **include_values** is **True** - - :raises: :class:`stem.ControllerError` if the call fails and we weren't - provided a default response - """ - - config_lines = self.get_info('config-text').splitlines() - - # Tor provides some config options even if they haven't been set... - # - # https://trac.torproject.org/projects/tor/ticket/2362 - # https://trac.torproject.org/projects/tor/ticket/17909 - - default_lines = ( - 'Log notice stdout', - 'Log notice file /var/log/tor/log', - 'DataDirectory /home/%s/.tor' % self.get_user('undefined'), - 'HiddenServiceStatistics 0', - ) - - for line in default_lines: - if line in config_lines: - config_lines.remove(line) - - if include_values: - return config_lines - else: - return list(set([line.split(' ')[0] for line in config_lines])) - def set_conf(self, param, value): """ Changes the value of a tor configuration option. Our value can be any of diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index cf604c6..84bf58a 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -189,8 +189,6 @@ class TestController(unittest.TestCase): self.assertTrue(isinstance(event, stem.response.events.ConfChangedEvent)) - controller.reset_conf('NodeFamily') - @require_controller def test_reattaching_listeners(self): """ @@ -470,24 +468,6 @@ class TestController(unittest.TestCase): self.assertEqual({}, controller.get_conf_map([], 'la-di-dah')) @require_controller - def test_get_custom_conf(self): - """ - Exercises our get_custom_conf() method. - """ - - runner = test.runner.get_runner() - - with runner.get_tor_controller() as controller: - custom_options = controller.get_custom_conf() - self.assertTrue('ControlPort' in custom_options or 'ControlSocket' in custom_options) - self.assertTrue('DownloadExtraInfo' in custom_options) - self.assertTrue('SocksListenAddress' in custom_options) - - custom_options = controller.get_custom_conf(include_values = True) - self.assertTrue('DownloadExtraInfo 1' in custom_options) - self.assertTrue('SocksListenAddress 127.0.0.1:1112' in custom_options) - - @require_controller def test_hidden_services_conf(self): """ Exercises the hidden service family of methods (get_hidden_service_conf,

1 0

[stem/master] Controller method for getting custom config options
by atagar＠torproject.org 22 Dec '15

22 Dec '15

commit e1124d2d29f8cd92d88d46f1024c81eafd5595f1 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Dec 22 09:28:12 2015 -0800 Controller method for getting custom config options Tor doesn't provide a reliable method of checking 'which config options have I set?'. As such, adding one. --- docs/change_log.rst | 1 + stem/control.py | 48 ++++++++++++++++++++++++++++++++++++++ test/integ/control/controller.py | 20 ++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/docs/change_log.rst b/docs/change_log.rst index 87ea053..39d109c 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -48,6 +48,7 @@ The following are only available within Stem's `git repository * Added `stem.manual <api/manual.html>`_, which provides information available about Tor from `its manual <https://www.torproject.org/docs/tor-manual.html.en>`_ (:trac:`8251`) * :func:`~stem.connection.connect` and :func:`~stem.control.Controller.from_port` now connect to both port 9051 (relay's default) and 9151 (Tor Browser's default) (:trac:`16075`) * Added `support for NETWORK_LIVENESS events <api/response.html#stem.response.events.NetworkLivenessEvent>`_ (:spec:`44aac63`) + * Added :func:`~stem.control.Controller.get_custom_conf` to the :class:`~stem.control.Controller` * Added :func:`~stem.control.Controller.is_user_traffic_allowed` to the :class:`~stem.control.Controller` * Added the replica attribute to the :class:`~stem.response.events.HSDescEvent` (:spec:`4989e73`) * IPv6 addresses could trigger errors in :func:`~stem.control.Controller.get_listeners`, :class:`~stem.response.events.ORConnEvent`, and quite a few other things (:trac:`16174`) diff --git a/stem/control.py b/stem/control.py index 3b1edfa..91c607e 100644 --- a/stem/control.py +++ b/stem/control.py @@ -93,6 +93,7 @@ If you're fine with allowing your script to raise exceptions then this can be mo | |- get_conf - gets the value of a configuration option |- get_conf_map - gets the values of multiple configuration options + |- get_custom_conf - provides configuration options that differ from their defaults |- set_conf - sets the value of a configuration option |- reset_conf - reverts configuration options to their default values |- set_options - sets or resets the values of multiple configuration options @@ -1986,6 +1987,8 @@ class Controller(BaseController): def get_conf(self, param, default = UNDEFINED, multiple = False): """ + get_conf(param, default = UNDEFINED, multiple = False) + Queries the current value for a configuration option. Some configuration options (like the ExitPolicy) can have multiple values. This provides a **list** with all of the values if **multiple** is **True**. Otherwise this @@ -2033,6 +2036,8 @@ class Controller(BaseController): def get_conf_map(self, params, default = UNDEFINED, multiple = True): """ + get_conf_map(params, default = UNDEFINED, multiple = True) + Similar to :func:`~stem.control.Controller.get_conf` but queries multiple configuration options, providing back a mapping of those options to their values. @@ -2170,6 +2175,49 @@ class Controller(BaseController): return return_dict + @with_default() + def get_custom_conf(self, default = UNDEFINED, include_values = False): + """ + get_custom_conf(params, default = UNDEFINED, multiple = True) + + Provides tor configuration options that differ from their defaults. + + .. versionadded:: 1.5.0 + + :param object default: response if the query fails + :param bool include_values: provides full configuration lines that can be + saved, similar to 'GETINFO config-text' + + :returns: **list** of configuration options that have been set, or config + lines if **include_values** is **True** + + :raises: :class:`stem.ControllerError` if the call fails and we weren't + provided a default response + """ + + config_lines = self.get_info('config-text').splitlines() + + # Tor provides some config options even if they haven't been set... + # + # https://trac.torproject.org/projects/tor/ticket/2362 + # https://trac.torproject.org/projects/tor/ticket/17909 + + default_lines = ( + 'Log notice stdout', + 'Log notice file /var/log/tor/log', + 'DataDirectory /home/%s/.tor' % self.get_user('undefined'), + 'HiddenServiceStatistics 0', + ) + + for line in default_lines: + if line in config_lines: + config_lines.remove(line) + + if include_values: + return config_lines + else: + return list(set([line.split(' ')[0] for line in config_lines])) + def set_conf(self, param, value): """ Changes the value of a tor configuration option. Our value can be any of diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 84bf58a..cf604c6 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -189,6 +189,8 @@ class TestController(unittest.TestCase): self.assertTrue(isinstance(event, stem.response.events.ConfChangedEvent)) + controller.reset_conf('NodeFamily') + @require_controller def test_reattaching_listeners(self): """ @@ -468,6 +470,24 @@ class TestController(unittest.TestCase): self.assertEqual({}, controller.get_conf_map([], 'la-di-dah')) @require_controller + def test_get_custom_conf(self): + """ + Exercises our get_custom_conf() method. + """ + + runner = test.runner.get_runner() + + with runner.get_tor_controller() as controller: + custom_options = controller.get_custom_conf() + self.assertTrue('ControlPort' in custom_options or 'ControlSocket' in custom_options) + self.assertTrue('DownloadExtraInfo' in custom_options) + self.assertTrue('SocksListenAddress' in custom_options) + + custom_options = controller.get_custom_conf(include_values = True) + self.assertTrue('DownloadExtraInfo 1' in custom_options) + self.assertTrue('SocksListenAddress 127.0.0.1:1112' in custom_options) + + @require_controller def test_hidden_services_conf(self): """ Exercises the hidden service family of methods (get_hidden_service_conf,

1 0

[webwml/master] Make donate-blog-benw page
by sebastian＠torproject.org 22 Dec '15

22 Dec '15

commit 3e38f7440e3fe8679d47c7315efc06d771bb7689 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Dec 22 18:14:07 2015 +0100 Make donate-blog-benw page --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index b5523e3..15c6cc0 100644 --- a/.htaccess +++ b/.htaccess @@ -64,6 +64,7 @@ RewriteRule ^donate/donate-blog-molly(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-rabbirob(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-cory(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-blog-benw(.*) /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-benw.wml b/donate/en/donate-blog-benw.wml new file mode 100644 index 0000000..e69de29

1 0

[stem/master] Updating with DirCache option
by atagar＠torproject.org 22 Dec '15

22 Dec '15

commit a7ec98cd73fe3e8b27b9c98a0389c231b0ff51b1 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Dec 22 08:47:10 2015 -0800 Updating with DirCache option --- stem/cached_tor_manual.cfg | 9 +++++++-- stem/settings.cfg | 1 + test/integ/manual.py | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/stem/cached_tor_manual.cfg b/stem/cached_tor_manual.cfg index 9a6fed0..a05c4e9 100644 --- a/stem/cached_tor_manual.cfg +++ b/stem/cached_tor_manual.cfg @@ -6,8 +6,8 @@ description |Basically, Tor provides a distributed network of servers or relays ("onion routers"). Users bounce their TCP streams -- web traffic, ftp, ssh, etc. -- around the network, and recipients, observers, and even the relays themselves have difficulty tracking the source of the stream. | |By default, tor will only act as a client only. To help the network by providing bandwidth as a relay, change the ORPort configuration option -- see below. Please also consult the documentation on the Tor Project's website. -man_commit aa4be914f06baa92857de201a212b9fc9856bdb1 -stem_commit d4fac7f81c180cf8e83ea81d4f3f2e8d0d2ce491 +man_commit 997f779a7f05540e5f564b4d121706c4a7069fb2 +stem_commit 4b49f5d1a616acfd7b1e5b9c7c82b3f8bed836d7 commandline_options -f FILE => Specify a new configuration file to contain further Tor configuration options OR pass - to make Tor read its configuration from standard input. (Default: @CONFDIR@/torrc, or $HOME/.torrc if that file is not found) commandline_options --ignore-missing-torrc => Specifies that Tor should treat a missing torrc file as though it were empty. Ordinarily, Tor does this for missing default torrc files, but not for those specified on the command line. commandline_options --list-fingerprint => Generate your keys and output your nickname and fingerprint. @@ -671,6 +671,11 @@ config_options.DirPolicy.name DirPolicy config_options.DirPolicy.usage policy,policy,... config_options.DirPolicy.summary Access policy for the DirPort config_options.DirPolicy.description Set an entrance policy for this server, to limit who can connect to the directory ports. The policies have the same form as exit policies above, except that port specifiers are ignored. Any address not matched by some entry in the policy is accepted. +config_options.DirCache.category Directory +config_options.DirCache.name DirCache +config_options.DirCache.usage 0|1 +config_options.DirCache.summary Provide cached descriptor information to other tor users +config_options.DirCache.description When this option is set, Tor caches all current directory documents and accepts client requests for them. Setting DirPort is not required for this, because clients connect via the ORPort by default. Setting either DirPort or BridgeRelay and setting DirCache to 0 is not supported. (Default: 1) config_options.BandwidthRate.category General config_options.BandwidthRate.name BandwidthRate config_options.BandwidthRate.usage N bytes|KBytes|MBytes|GBytes|KBits|MBits|GBits diff --git a/stem/settings.cfg b/stem/settings.cfg index b590afe..82e8f88 100644 --- a/stem/settings.cfg +++ b/stem/settings.cfg @@ -265,6 +265,7 @@ manual.summary.DirPortFrontPage Publish this html file on the DirPort manual.summary.DirPort Port for directory connections manual.summary.DirListenAddress Address the directory service is bound to manual.summary.DirPolicy Access policy for the DirPort +manual.summary.DirCache Provide cached descriptor information to other tor users # Directory Authority Server Options diff --git a/test/integ/manual.py b/test/integ/manual.py index d0b1bf1..9fccb54 100644 --- a/test/integ/manual.py +++ b/test/integ/manual.py @@ -305,4 +305,4 @@ class TestManual(unittest.TestCase): extra_in_manual = config_options_in_manual.difference(config_options_in_tor) if extra_in_manual: - self.fail("The %s config options in our man page aren't presently supported by tor. Maybe we need to remove them?" % ', '.join(extra_in_manual)) + self.fail("The %s config options in our man page aren't presently supported by tor. Are we using the latest git commit of tor? If so, maybe we need to remove them?" % ', '.join(extra_in_manual))

1 0

[tor/master] document minimum heartbeatperiod; bug 15638.
by nickm＠torproject.org 22 Dec '15

22 Dec '15

commit b9596b8fdf5006d650bba0109e5614b5a387dbdf Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 22 11:10:37 2015 -0500 document minimum heartbeatperiod; bug 15638. --- changes/bug15638 | 2 ++ doc/tor.1.txt | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug15638 b/changes/bug15638 new file mode 100644 index 0000000..cf5d469 --- /dev/null +++ b/changes/bug15638 @@ -0,0 +1,2 @@ + o Documentation: + - Document the minimum HeartbeatPeriod value. Closes ticket 15638. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 021353d..3514c4d 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1750,7 +1750,8 @@ is non-zero): Log a heartbeat message every **HeartbeatPeriod** seconds. This is a log level __notice__ message, designed to let you know your Tor server is still alive and doing useful things. Settings this - to 0 will disable the heartbeat. (Default: 6 hours) + to 0 will disable the heartbeat. Otherwise, it must be at least 30 + minutes. (Default: 6 hours) [[AccountingMax]] **AccountingMax** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**KBits**|**MBits**|**GBits**|**TBytes**:: Limits the max number of bytes sent and received within a set time period

1 0

[tor/master] Remove extra quotes from log message
by nickm＠torproject.org 22 Dec '15

22 Dec '15

commit 45f5e597517abedbf9d650428ac53f03f37089d8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 22 10:31:26 2015 -0500 Remove extra quotes from log message Bug 17843; fix on ddc65e2b --- changes/bug17843 | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug17843 b/changes/bug17843 new file mode 100644 index 0000000..6cb16a0 --- /dev/null +++ b/changes/bug17843 @@ -0,0 +1,3 @@ + o Minor bugfixes (logging): + - Remove needless quotes from a log message about unparseable addresses. + Fixes bug 17843; bugfix on 0.2.3.3-alpha. diff --git a/src/or/config.c b/src/or/config.c index e3d6653..a1f8e49 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6366,7 +6366,7 @@ parse_port_config(smartlist_t *out, } port = ptmp; } else { - log_warn(LD_CONFIG, "Couldn't parse address '%s' for %sPort", + log_warn(LD_CONFIG, "Couldn't parse address %s for %sPort", escaped(addrport), portname); goto err; }

1 0

[tor/master] Add an unreachable line to make the compiler happy
by nickm＠torproject.org 22 Dec '15

22 Dec '15

commit 4ec0f8531ee4f40cfb3eeca4c383c454986a268a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 22 10:27:04 2015 -0500 Add an unreachable line to make the compiler happy --- src/common/crypto.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/common/crypto.c b/src/common/crypto.c index a11ca79..251bbbf 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1731,6 +1731,7 @@ crypto_digest_algorithm_get_length(digest_algorithm_t alg) return DIGEST512_LEN; default: tor_assert(0); + return 0; /* Unreachable */ } }

1 0

[webwml/master] add a redirect for the george torwell donations drive
by arma＠torproject.org 22 Dec '15

22 Dec '15

commit aeffd059b8082e8318d16f7c64b0b8eeb05def68 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Dec 22 00:49:09 2015 -0500 add a redirect for the george torwell donations drive --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index b3992a7..b5523e3 100644 --- a/.htaccess +++ b/.htaccess @@ -59,6 +59,7 @@ RewriteRule ^donate/donate-download(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-button(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/giving-tue-blog(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-roger(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-george-torwell(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-molly(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-rabbirob(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-cory(.*) /donate/donate$1 [R=302,L] diff --git a/donate/en/donate-george-torwell.wml b/donate/en/donate-george-torwell.wml new file mode 100644 index 0000000..e69de29

1 0