]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
5 years agoTurn several functions from stubs into macros
Nick Mathewson [Wed, 15 Jan 2020 17:30:43 +0000 (12:30 -0500)] 
Turn several functions from stubs into macros

This may help the compiler eliminate deadcode.

5 years agoRename dirclient_modes.h identifiers to start with dirclient_
Nick Mathewson [Wed, 15 Jan 2020 16:57:49 +0000 (11:57 -0500)] 
Rename dirclient_modes.h identifiers to start with dirclient_

This is an automated commit, generated by this command:

./scripts/maint/rename_c_identifier.py \
        directory_must_use_begindir dirclient_must_use_begindir \
        directory_fetches_from_authorities dirclient_fetches_from_authorities \
        directory_fetches_dir_info_early dirclient_fetches_dir_info_early \
        directory_fetches_dir_info_later dirclient_fetches_dir_info_later \
        directory_too_idle_to_fetch_descriptors dirclient_too_idle_to_fetch_descriptors

5 years agoMove directory_must_use_begindir() to dirclient_modes.[ch]
Nick Mathewson [Wed, 15 Jan 2020 16:55:16 +0000 (11:55 -0500)] 
Move directory_must_use_begindir() to dirclient_modes.[ch]

5 years agoMove dirclient-related functions out of dirserv, and reenable them
Nick Mathewson [Wed, 15 Jan 2020 16:43:14 +0000 (11:43 -0500)] 
Move dirclient-related functions out of dirserv, and reenable them

I had incorrectly identified these functions as dircache-only, when
in fact they apply to everyone who acts a directory client.

5 years agoAdd a changes file for disabling the dircache code.
Nick Mathewson [Thu, 9 Jan 2020 02:55:41 +0000 (21:55 -0500)] 
Add a changes file for disabling the dircache code.

5 years agoDisable feature/dircache files when dircache module is disabled.
Nick Mathewson [Thu, 9 Jan 2020 02:13:29 +0000 (21:13 -0500)] 
Disable feature/dircache files when dircache module is disabled.

To make Tor still work, we define a minimal dircache_stub.c file
that defines the entry points to the module that can actually be
seen by the compiler when we're building with dircache and relay
disabled.

5 years agoUse dir_conn_clear_spool() in connection.c.
Nick Mathewson [Thu, 9 Jan 2020 02:43:02 +0000 (21:43 -0500)] 
Use dir_conn_clear_spool() in connection.c.

This is cleaner than iterating over the spool.

5 years agoMove dirserv_get_routerdescs() to control_getinfo.c
Nick Mathewson [Thu, 9 Jan 2020 02:32:16 +0000 (21:32 -0500)] 
Move dirserv_get_routerdescs() to control_getinfo.c

This function had some XXX comments indicating (correctly) that it
was not actually used by the dirserver code, and that only the
controller still used it.

5 years agoMove dir_split_resource_into_spoolable() to dircache module.
Nick Mathewson [Thu, 9 Jan 2020 02:24:26 +0000 (21:24 -0500)] 
Move dir_split_resource_into_spoolable() to dircache module.

Only directory caches actually need to spool things.

5 years agoDefine a "dircache" module.
Nick Mathewson [Thu, 9 Jan 2020 02:03:20 +0000 (21:03 -0500)] 
Define a "dircache" module.

For now, this module is enabled whenever the relay module is
enabled, and disabled whenever the relay module is disabled.  Though
they are logically separate, the use cases for running one without
the other are rare enough that we don't really want to support
compiling them independently.

5 years agocore/include.am: spelling fix
Nick Mathewson [Thu, 9 Jan 2020 01:50:02 +0000 (20:50 -0500)] 
core/include.am: spelling fix

5 years agoIt's 2020. Update the copyright dates with "make update-copyright"
Nick Mathewson [Wed, 8 Jan 2020 23:39:17 +0000 (18:39 -0500)] 
It's 2020. Update the copyright dates with "make update-copyright"

5 years agoRun "make autostyle"; add an endif comment
Nick Mathewson [Wed, 8 Jan 2020 23:38:24 +0000 (18:38 -0500)] 
Run "make autostyle"; add an endif comment

5 years agorouter: Improve port search function comments
teor [Wed, 8 Jan 2020 07:46:28 +0000 (17:46 +1000)] 
router: Improve port search function comments

5 years agospeaking of utf-8, remove strange char from comment
Roger Dingledine [Tue, 7 Jan 2020 23:25:17 +0000 (18:25 -0500)] 
speaking of utf-8, remove strange char from comment

5 years agoMerge branch 'ticket32845_squashed'
Nick Mathewson [Tue, 7 Jan 2020 15:16:15 +0000 (10:16 -0500)] 
Merge branch 'ticket32845_squashed'

5 years agochanges: file for 32845
teor [Tue, 7 Jan 2020 07:13:22 +0000 (17:13 +1000)] 
changes: file for 32845

5 years agostring: Check UTF-8 string pointer and length
teor [Tue, 7 Jan 2020 07:09:25 +0000 (17:09 +1000)] 
string: Check UTF-8 string pointer and length

If they are inconsistent, output a raw bug log.

Part of 32845.

5 years agoMerge remote-tracking branch 'tor-github/pr/1640'
Nick Mathewson [Tue, 7 Jan 2020 13:59:31 +0000 (08:59 -0500)] 
Merge remote-tracking branch 'tor-github/pr/1640'

5 years agotest_helpers: add a missing free for CID 1457527.
Nick Mathewson [Tue, 7 Jan 2020 13:22:02 +0000 (08:22 -0500)] 
test_helpers: add a missing free for CID 1457527.

5 years agoAdd new state to connection_proxy_state_to_string()
Nick Mathewson [Tue, 7 Jan 2020 13:09:27 +0000 (08:09 -0500)] 
Add new state to connection_proxy_state_to_string()

Also, add a CTASSERT() to make sure that we don't let this array get
out-of-sync again.

Found by coverity; this is CID 1457528.

5 years agostring: Add extra UTF-8 test cases
teor [Tue, 7 Jan 2020 07:05:48 +0000 (17:05 +1000)] 
string: Add extra UTF-8 test cases

These test cases are validated differently by some
programming languages, because those languages have
incorrect UTF-8 implementations.

We want to make sure that tor validates them correctly.

Closes ticket 32845.

5 years agoSpace the a-d unsigned ints in tor_inet_aton()
Neel Chauhan [Tue, 7 Jan 2020 04:20:38 +0000 (20:20 -0800)] 
Space the a-d unsigned ints in tor_inet_aton()

5 years agoMerge branch 'haxxpop/tcp_proxy_squashed' into tcp_proxy_squshed_and_merged
Nick Mathewson [Mon, 6 Jan 2020 18:41:20 +0000 (13:41 -0500)] 
Merge branch 'haxxpop/tcp_proxy_squashed' into tcp_proxy_squshed_and_merged

5 years agocircuit: Add change file
Suphanat Chunhapanya [Mon, 2 Dec 2019 07:24:44 +0000 (15:24 +0800)] 
circuit: Add change file

5 years agotest: HTTP CONNECT protocol
Suphanat Chunhapanya [Mon, 21 Oct 2019 17:55:23 +0000 (01:55 +0800)] 
test: HTTP CONNECT protocol

5 years agotest: HAPRoxy protocol
Suphanat Chunhapanya [Mon, 21 Oct 2019 10:00:02 +0000 (18:00 +0800)] 
test: HAPRoxy protocol

5 years agotest: Implement haproxy
Suphanat Chunhapanya [Tue, 10 Sep 2019 07:32:08 +0000 (15:32 +0800)] 
test: Implement haproxy

5 years agocircuit: Implement haproxy
Suphanat Chunhapanya [Fri, 23 Aug 2019 03:44:49 +0000 (11:44 +0800)] 
circuit: Implement haproxy

5 years agoMerge remote-tracking branch 'tor-github/pr/1615'
Nick Mathewson [Mon, 6 Jan 2020 18:32:33 +0000 (13:32 -0500)] 
Merge remote-tracking branch 'tor-github/pr/1615'

5 years agoAdd documentation about building a TAGS file.
Nick Mathewson [Mon, 6 Jan 2020 18:31:30 +0000 (13:31 -0500)] 
Add documentation about building a TAGS file.

Patch from opara.  Closes ticket 32779.

5 years agoMerge remote-tracking branch 'tor-github/pr/1620'
Nick Mathewson [Mon, 6 Jan 2020 18:28:10 +0000 (13:28 -0500)] 
Merge remote-tracking branch 'tor-github/pr/1620'

5 years agoMerge branch 'maint-0.4.2'
Nick Mathewson [Mon, 6 Jan 2020 18:24:01 +0000 (13:24 -0500)] 
Merge branch 'maint-0.4.2'

5 years agoMerge remote-tracking branch 'tor-github/pr/1612' into maint-0.4.2
Nick Mathewson [Mon, 6 Jan 2020 18:20:57 +0000 (13:20 -0500)] 
Merge remote-tracking branch 'tor-github/pr/1612' into maint-0.4.2

5 years agoMerge branch 'maint-0.4.2'
Nick Mathewson [Mon, 6 Jan 2020 13:08:59 +0000 (08:08 -0500)] 
Merge branch 'maint-0.4.2'

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Mon, 6 Jan 2020 13:08:59 +0000 (08:08 -0500)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoupdate changes file to pass "make check-changes"
Nick Mathewson [Mon, 6 Jan 2020 13:08:48 +0000 (08:08 -0500)] 
update changes file to pass "make check-changes"

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Mon, 6 Jan 2020 13:06:54 +0000 (08:06 -0500)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoFix sandbox crash during reload of logging configuration
Peter Gerber [Sun, 5 Jan 2020 14:48:54 +0000 (15:48 +0100)] 
Fix sandbox crash during reload of logging configuration

Allow calls to dup() which was introduced in commit a22fbab986.

From a security perspective, I don't think this should impact the
security of the sandbox significantly. As far as I can tell, there
is nothing an adversary can do with a duplicated FD that can't be
done with the original.

5 years agoFix spacing in tor_sscanf() call in tor_inet_aton()
Neel Chauhan [Fri, 20 Dec 2019 19:11:03 +0000 (14:11 -0500)] 
Fix spacing in tor_sscanf() call in tor_inet_aton()

5 years agoFix spacing in tor_inet_aton() function header
Neel Chauhan [Fri, 20 Dec 2019 19:10:43 +0000 (14:10 -0500)] 
Fix spacing in tor_inet_aton() function header

5 years agoMerge branch 'bug29819_035'
Nick Mathewson [Fri, 20 Dec 2019 12:37:47 +0000 (07:37 -0500)] 
Merge branch 'bug29819_035'

5 years agoMerge remote-tracking branch 'tor-github/pr/1623'
Nick Mathewson [Fri, 20 Dec 2019 12:18:38 +0000 (07:18 -0500)] 
Merge remote-tracking branch 'tor-github/pr/1623'

5 years agoReplace several C identifiers.
teor [Fri, 20 Dec 2019 03:27:58 +0000 (13:27 +1000)] 
Replace several C identifiers.

This is an automated commit, generated by this command:

./scripts/maint/rename_c_identifier.py \
        EXPOSE_CLEAN_BACKTRACE BACKTRACE_PRIVATE \
        TOR_CHANNEL_INTERNAL_ CHANNEL_OBJECT_PRIVATE \
        CHANNEL_PRIVATE_ CHANNEL_FILE_PRIVATE \
        EXPOSE_ROUTERDESC_TOKEN_TABLE ROUTERDESC_TOKEN_TABLE_PRIVATE \
        SCHEDULER_PRIVATE_ SCHEDULER_PRIVATE

5 years agoMerge branch 'maint-0.4.2'
teor [Fri, 20 Dec 2019 00:12:59 +0000 (10:12 +1000)] 
Merge branch 'maint-0.4.2'

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
teor [Fri, 20 Dec 2019 00:12:51 +0000 (10:12 +1000)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'maint-0.4.0' into maint-0.4.1
teor [Fri, 20 Dec 2019 00:12:43 +0000 (10:12 +1000)] 
Merge branch 'maint-0.4.0' into maint-0.4.1

5 years agoMerge remote-tracking branch 'tor-github/pr/1606'
teor [Fri, 20 Dec 2019 00:12:18 +0000 (10:12 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1606'

5 years agoCode Style: Delete headers that are included twice
teor [Mon, 25 Nov 2019 23:10:32 +0000 (09:10 +1000)] 
Code Style: Delete headers that are included twice

These changes were created using the "make autostyle" from
32522, and then split into commits.

5 years agoCode Style: Delete PRIVATE defines that are never used
teor [Mon, 25 Nov 2019 23:07:47 +0000 (09:07 +1000)] 
Code Style: Delete PRIVATE defines that are never used

Some ".c" files define *_PRIVATE macros, but those macros are
not used in any header file. Delete them.

These changes were created using the "make autostyle" from
32522, and then split into commits.

5 years agoRun "make autostyle"
teor [Thu, 19 Dec 2019 23:45:53 +0000 (09:45 +1000)] 
Run "make autostyle"

5 years agoMakefile/git scripts: Add comments to keep owned file lists in sync
teor [Mon, 25 Nov 2019 23:20:57 +0000 (09:20 +1000)] 
Makefile/git scripts: Add comments to keep owned file lists in sync

5 years agoMark TestingEstimatedDescriptorPropagationTime as obsolete.
Nick Mathewson [Thu, 19 Dec 2019 16:04:48 +0000 (11:04 -0500)] 
Mark TestingEstimatedDescriptorPropagationTime as obsolete.

We stopped looking at this option in 85cf6dcba3693b, back when we
implemented the minimal pieces of prop275.  Since then, we've had
code to validate and adjust this option, and to give it a different
value in testing networks, but the option hasn't actually done
anything.

We can safely mark it as OBSOLETE, since doing so does not make any
old configuration get rejected.

Closes ticket 32807.

5 years agoMerge branch 'dirauth_config_squashed'
Nick Mathewson [Thu, 19 Dec 2019 12:55:06 +0000 (07:55 -0500)] 
Merge branch 'dirauth_config_squashed'

5 years agoDeclare relay/dirauth subsystem levels in a header.
Nick Mathewson [Wed, 18 Dec 2019 16:49:26 +0000 (11:49 -0500)] 
Declare relay/dirauth subsystem levels in a header.

This way, we can't get out of sync between the two declarations.

5 years agoAdd an integration test for options disabled by dirauth subsystem.
Nick Mathewson [Mon, 16 Dec 2019 00:05:17 +0000 (19:05 -0500)] 
Add an integration test for options disabled by dirauth subsystem.

5 years agoAdd config object for dirauth; move one option there.
Nick Mathewson [Sun, 15 Dec 2019 16:46:55 +0000 (11:46 -0500)] 
Add config object for dirauth; move one option there.

I've chosen the "AuthDirMaxServersPerAddr" option here for
simplicity, since it is used literally nowhere else besides the dirauth
module.  Once we have all the infrastructure in place for this, we
can move more options into this structure.

5 years agoAllow struct_magic to be disabled.
Nick Mathewson [Sun, 15 Dec 2019 23:42:01 +0000 (18:42 -0500)] 
Allow struct_magic to be disabled.

When a subsystem is disabled, there will be no corresponding object
allocated, and no magic numbers on it.

5 years agoSupport a flag to indicate that a config var is disabled
Nick Mathewson [Sun, 15 Dec 2019 23:40:12 +0000 (18:40 -0500)] 
Support a flag to indicate that a config var is disabled

Like "obsolete" variables, these variables produce a warning when
you try to set them, but the warning says that the relevant module
doesn't have support.

The confdecl macros now have a CONF_CONTEXT that you can define to
make all the modules in a given table disabled.

5 years agoAdd "stub" files for disabled modules.
Nick Mathewson [Sun, 15 Dec 2019 23:10:11 +0000 (18:10 -0500)] 
Add "stub" files for disabled modules.

These modules are only built when the selected modules are disabled.
The provide stub implementations of the subsystem blocks.  Later,
other stub implementations could move here.

Having real subsystem blocks here will let us handle disabled
configuration options better.

5 years agoMerge remote-tracking branch 'tor-github/pr/1584'
teor [Thu, 19 Dec 2019 09:33:29 +0000 (19:33 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1584'

5 years agoMerge branch 'tor-github/pr/1587'
George Kadianakis [Wed, 18 Dec 2019 12:19:15 +0000 (14:19 +0200)] 
Merge branch 'tor-github/pr/1587'

6 years agoAdd NSF support acknowledgment to circpad dev doc.
Mike Perry [Tue, 17 Dec 2019 20:02:23 +0000 (14:02 -0600)] 
Add NSF support acknowledgment to circpad dev doc.

6 years agoMerge branch 'ticket32172_once_again'
Nick Mathewson [Tue, 17 Dec 2019 20:02:06 +0000 (15:02 -0500)] 
Merge branch 'ticket32172_once_again'

6 years agoCorrect how we use libseccomp
Peter Gerber [Mon, 10 Jun 2019 12:56:31 +0000 (14:56 +0200)] 
Correct how we use libseccomp

This fixes a startup crash with libseccomp v2.4.0 if Sandbox is
set to 1.

6 years agoMerge remote-tracking branch 'tor-github/pr/1596'
Nick Mathewson [Tue, 17 Dec 2019 14:39:50 +0000 (09:39 -0500)] 
Merge remote-tracking branch 'tor-github/pr/1596'

6 years agoMerge branch 'tor-github/pr/1608'
David Goulet [Tue, 17 Dec 2019 14:30:19 +0000 (09:30 -0500)] 
Merge branch 'tor-github/pr/1608'

6 years agoMerge branch 'tor-github/pr/1609'
David Goulet [Tue, 17 Dec 2019 14:26:49 +0000 (09:26 -0500)] 
Merge branch 'tor-github/pr/1609'

6 years agoMerge branch 'pr1590_amended_commit'
teor [Mon, 16 Dec 2019 23:49:30 +0000 (09:49 +1000)] 
Merge branch 'pr1590_amended_commit'

6 years agomanpage: fixes to alphabetize General Options
Taylor Yu [Mon, 16 Dec 2019 04:46:31 +0000 (22:46 -0600)] 
manpage: fixes to alphabetize General Options

6 years agoFix formatting in tor_assertf() message in struct_check_magic().
Nick Mathewson [Mon, 16 Dec 2019 20:31:23 +0000 (15:31 -0500)] 
Fix formatting in tor_assertf() message in struct_check_magic().

Closes 32771; bugfix on 0.4.2.1-alpha.

6 years agoMerge branch 'bug32765_041' into bug32771_042
Nick Mathewson [Mon, 16 Dec 2019 20:27:18 +0000 (15:27 -0500)] 
Merge branch 'bug32765_041' into bug32771_042

6 years agoUse CHECK_PRINTF() for printf-like functions in util_bug.h
Nick Mathewson [Mon, 16 Dec 2019 20:14:13 +0000 (15:14 -0500)] 
Use CHECK_PRINTF() for printf-like functions in util_bug.h

6 years agoMerge branch 'tor-github/pr/1591'
George Kadianakis [Mon, 16 Dec 2019 20:01:10 +0000 (22:01 +0200)] 
Merge branch 'tor-github/pr/1591'

6 years agoAdd changes file
Mike Perry [Wed, 11 Dec 2019 21:38:00 +0000 (13:38 -0800)] 
Add changes file

6 years agoAdd circuit padding developer and quickstart docs.
Mike Perry [Thu, 15 Aug 2019 20:35:06 +0000 (15:35 -0500)] 
Add circuit padding developer and quickstart docs.

6 years agoCompact lines in test_e2e_rend_circuit_setup()
Neel Chauhan [Mon, 16 Dec 2019 19:23:09 +0000 (14:23 -0500)] 
Compact lines in test_e2e_rend_circuit_setup()

6 years agoRemove extra space from helper_get_circ_and_stream_for_test() call in test_e2e_rend_c...
Neel Chauhan [Mon, 16 Dec 2019 19:19:55 +0000 (14:19 -0500)] 
Remove extra space from helper_get_circ_and_stream_for_test() call in test_e2e_rend_circuit_setup()

6 years agoMerge branch 'bug32240_32242_042' into bug32240_32242_master
teor [Sun, 15 Dec 2019 23:25:38 +0000 (09:25 +1000)] 
Merge branch 'bug32240_32242_042' into bug32240_32242_master

Merge:
* libzstd-dev from ticket32242_042
* coccinelle from master

6 years agoMerge branch 'bug32240_32242_041' into bug32240_32242_042
teor [Sun, 15 Dec 2019 23:23:46 +0000 (09:23 +1000)] 
Merge branch 'bug32240_32242_041' into bug32240_32242_042

6 years agoMerge branch 'bug32240_32242_040' into bug32240_32242_041
teor [Sun, 15 Dec 2019 23:23:41 +0000 (09:23 +1000)] 
Merge branch 'bug32240_32242_040' into bug32240_32242_041

6 years agoMerge branch 'bug32240_32242_035' into bug32240_32242_040
teor [Sun, 15 Dec 2019 23:22:52 +0000 (09:22 +1000)] 
Merge branch 'bug32240_32242_035' into bug32240_32242_040

Merge:
* libzstd-dev from ticket32242_035
* shellcheck from maint-0.4.0

6 years agoMerge remote-tracking branch 'tor-github/pr/1459' into bug32240_32242_035
teor [Sun, 15 Dec 2019 23:21:05 +0000 (09:21 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1459' into bug32240_32242_035

6 years agoMerge branch 'bug32240_042' into bug32240_master
teor [Sun, 15 Dec 2019 23:17:02 +0000 (09:17 +1000)] 
Merge branch 'bug32240_042' into bug32240_master

6 years agoMerge branch 'bug32240_041' into bug32240_042
teor [Sun, 15 Dec 2019 23:15:42 +0000 (09:15 +1000)] 
Merge branch 'bug32240_041' into bug32240_042

Merge:
* CHUTNEY_TOR_SANDBOX=0 from bug32240_041
* RUST_VERSION from maint-0.4.2

6 years agoMerge branch 'bug32240_040' into bug32240_041
teor [Sun, 15 Dec 2019 23:14:38 +0000 (09:14 +1000)] 
Merge branch 'bug32240_040' into bug32240_041

6 years agoMerge branch 'bug32240_035' into bug32240_040
teor [Sun, 15 Dec 2019 23:14:32 +0000 (09:14 +1000)] 
Merge branch 'bug32240_035' into bug32240_040

6 years agoMerge branch 'bug32240_029' into bug32240_035
teor [Sun, 15 Dec 2019 23:09:16 +0000 (09:09 +1000)] 
Merge branch 'bug32240_029' into bug32240_035

Merge
* Chutney Trusty deletion in bug32240_029
* NSS addition in maint-0.3.5

6 years agochanges: file for 32240 maint-0.2.9
teor [Sun, 15 Dec 2019 23:06:25 +0000 (09:06 +1000)] 
changes: file for 32240

6 years agoTravis: Run Chutney jobs in Ubuntu Bionic images
teor [Sun, 15 Dec 2019 23:03:48 +0000 (09:03 +1000)] 
Travis: Run Chutney jobs in Ubuntu Bionic images

Closes 32240.

6 years agoTravis: Turn off Tor's Sandbox in Chutney jobs
teor [Sun, 15 Dec 2019 23:01:45 +0000 (09:01 +1000)] 
Travis: Turn off Tor's Sandbox in Chutney jobs

We need to set "Sandbox 0", until we fix sandbox errors that are
triggered by Ubuntu Xenial and Bionic. See 32722.

Part of 32240.

6 years agoMerge branch 'maint-0.4.2'
teor [Sun, 15 Dec 2019 22:16:28 +0000 (08:16 +1000)] 
Merge branch 'maint-0.4.2'

6 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
teor [Sun, 15 Dec 2019 22:16:20 +0000 (08:16 +1000)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

6 years agoMerge branch 'maint-0.4.0' into maint-0.4.1
teor [Sun, 15 Dec 2019 22:16:12 +0000 (08:16 +1000)] 
Merge branch 'maint-0.4.0' into maint-0.4.1

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
teor [Sun, 15 Dec 2019 22:16:04 +0000 (08:16 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge branch 'maint-0.2.9' into maint-0.3.5
teor [Sun, 15 Dec 2019 22:15:55 +0000 (08:15 +1000)] 
Merge branch 'maint-0.2.9' into maint-0.3.5

6 years agoMerge remote-tracking branch 'tor-github/pr/1505'
teor [Sun, 15 Dec 2019 22:15:19 +0000 (08:15 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1505'

6 years agoMerge remote-tracking branch 'tor-github/pr/1577' into maint-0.4.2
teor [Sun, 15 Dec 2019 22:14:29 +0000 (08:14 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1577' into maint-0.4.2

6 years agoMerge remote-tracking branch 'tor-github/pr/1576' into maint-0.3.5
teor [Sun, 15 Dec 2019 22:14:04 +0000 (08:14 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1576' into maint-0.3.5

6 years agoMerge remote-tracking branch 'tor-github/pr/1575' into maint-0.2.9
teor [Sun, 15 Dec 2019 22:13:38 +0000 (08:13 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1575' into maint-0.2.9