]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
5 years agofix typo in comment
Roger Dingledine [Thu, 19 Mar 2020 04:41:57 +0000 (00:41 -0400)] 
fix typo in comment

5 years agoMerge branch 'maint-0.4.3'
Nick Mathewson [Wed, 18 Mar 2020 16:17:32 +0000 (12:17 -0400)] 
Merge branch 'maint-0.4.3'

"ours" to avoid version bump.

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Wed, 18 Mar 2020 16:17:20 +0000 (12:17 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

"ours" to avoid version bump.

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Wed, 18 Mar 2020 16:17:11 +0000 (12:17 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

"ours" to avoid version bump.

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Wed, 18 Mar 2020 16:16:59 +0000 (12:16 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

"ours" to avoid version bump.

5 years agoBump version to 0.4.2.7-dev
Nick Mathewson [Wed, 18 Mar 2020 16:16:11 +0000 (12:16 -0400)] 
Bump version to 0.4.2.7-dev

5 years agoBump version to 0.4.1.9-dev
Nick Mathewson [Wed, 18 Mar 2020 16:15:53 +0000 (12:15 -0400)] 
Bump version to 0.4.1.9-dev

5 years agoBump version to 0.3.5.10-dev
Nick Mathewson [Wed, 18 Mar 2020 16:15:32 +0000 (12:15 -0400)] 
Bump version to 0.3.5.10-dev

5 years agoCopy changelogs for today's releases to master.
Nick Mathewson [Wed, 18 Mar 2020 13:06:49 +0000 (09:06 -0400)] 
Copy changelogs for today's releases to master.

5 years agoMerge branch 'maint-0.4.3'
Nick Mathewson [Wed, 18 Mar 2020 12:20:38 +0000 (08:20 -0400)] 
Merge branch 'maint-0.4.3'

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Wed, 18 Mar 2020 12:20:16 +0000 (08:20 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Wed, 18 Mar 2020 12:20:16 +0000 (08:20 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Wed, 18 Mar 2020 12:20:16 +0000 (08:20 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

5 years agoPort rsa_private_key_too_long() to work on OpenSSL 1.1.0.
Nick Mathewson [Wed, 18 Mar 2020 12:19:48 +0000 (08:19 -0400)] 
Port rsa_private_key_too_long() to work on OpenSSL 1.1.0.

5 years agoMerge branch 'maint-0.4.3'
Nick Mathewson [Tue, 17 Mar 2020 19:22:36 +0000 (15:22 -0400)] 
Merge branch 'maint-0.4.3'

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Tue, 17 Mar 2020 19:22:36 +0000 (15:22 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Tue, 17 Mar 2020 19:22:36 +0000 (15:22 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Tue, 17 Mar 2020 19:22:36 +0000 (15:22 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

5 years agoMerge branch 'trove_2020_002_041' into maint-0.4.1
Nick Mathewson [Tue, 17 Mar 2020 19:22:02 +0000 (15:22 -0400)] 
Merge branch 'trove_2020_002_041' into maint-0.4.1

5 years agoMerge branch 'trove_2020_002_035' into maint-0.3.5
Nick Mathewson [Tue, 17 Mar 2020 19:21:48 +0000 (15:21 -0400)] 
Merge branch 'trove_2020_002_035' into maint-0.3.5

5 years agoMerge branch 'maint-0.4.3'
Nick Mathewson [Tue, 17 Mar 2020 17:56:10 +0000 (13:56 -0400)] 
Merge branch 'maint-0.4.3'

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Tue, 17 Mar 2020 17:56:10 +0000 (13:56 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Tue, 17 Mar 2020 17:56:10 +0000 (13:56 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'trove_2020_004_041_v2' into maint-0.4.1
Nick Mathewson [Tue, 17 Mar 2020 17:56:03 +0000 (13:56 -0400)] 
Merge branch 'trove_2020_004_041_v2' into maint-0.4.1

5 years agoMerge branch 'maint-0.4.3'
Nick Mathewson [Tue, 17 Mar 2020 15:53:24 +0000 (11:53 -0400)] 
Merge branch 'maint-0.4.3'

5 years agoSplit a wide line.
Nick Mathewson [Tue, 17 Mar 2020 15:53:01 +0000 (11:53 -0400)] 
Split a wide line.

5 years agoMerge branch 'maint-0.4.3'
Nick Mathewson [Tue, 17 Mar 2020 15:48:45 +0000 (11:48 -0400)] 
Merge branch 'maint-0.4.3'

5 years agoAdd unittest for TROVE-2020-003.
George Kadianakis [Tue, 11 Feb 2020 12:51:58 +0000 (14:51 +0200)] 
Add unittest for TROVE-2020-003.

This unittest currently fails on purpose (to demonstrate the bug) but it will
stop failing after the next commit (the bugfix).

5 years agoMerge branch 'maint-0.4.3'
Nick Mathewson [Tue, 17 Mar 2020 15:47:35 +0000 (11:47 -0400)] 
Merge branch 'maint-0.4.3'

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Tue, 17 Mar 2020 15:45:16 +0000 (11:45 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Tue, 17 Mar 2020 15:45:16 +0000 (11:45 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Tue, 17 Mar 2020 15:45:16 +0000 (11:45 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoFix TROVE-2020-003.
George Kadianakis [Tue, 11 Feb 2020 16:37:55 +0000 (18:37 +0200)] 
Fix TROVE-2020-003.

Given that ed25519 public key validity checks are usually not needed
and (so far) they are only necessary for onion addesses in the Tor
protocol, we decided to fix this specific bug instance without
modifying the rest of the codebase (see below for other fix
approaches).

In our minimal fix we check that the pubkey in
hs_service_add_ephemeral() is valid and error out otherwise.

5 years agoTrivial bugfixes found during TROVE investigation.
George Kadianakis [Mon, 10 Feb 2020 14:35:40 +0000 (16:35 +0200)] 
Trivial bugfixes found during TROVE investigation.

5 years agoMerge branch 'trove_2020_002_035' into trove_2020_002_041
Nick Mathewson [Tue, 17 Mar 2020 14:45:03 +0000 (10:45 -0400)] 
Merge branch 'trove_2020_002_035' into trove_2020_002_041

5 years agoUse >= consistently with max_bits.
Nick Mathewson [Tue, 17 Mar 2020 14:09:58 +0000 (10:09 -0400)] 
Use >= consistently with max_bits.

5 years agoAdd off-by-one checks for key length.
Nick Mathewson [Tue, 17 Mar 2020 14:07:54 +0000 (10:07 -0400)] 
Add off-by-one checks for key length.

5 years agoExtract key length check into a new function, and check more fields.
Nick Mathewson [Tue, 17 Mar 2020 14:04:38 +0000 (10:04 -0400)] 
Extract key length check into a new function, and check more fields.

In the openssl that I have, it should be safe to only check the size
of n.  But if I'm wrong, or if other openssls work differently, we
should check whether any of the fields are too large.

Issue spotted by Teor.

5 years agoMerge remote-tracking branch 'tor-github/pr/1784'
teor [Tue, 17 Mar 2020 13:11:31 +0000 (23:11 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1784'

5 years agoRun "practracker.py --regen-overbroad"
teor [Tue, 17 Mar 2020 13:02:16 +0000 (23:02 +1000)] 
Run "practracker.py --regen-overbroad"

We've successfully resolved a bunch of technical debt over the last
few months. Let's remove the allowances for that debt from the
practracker exceptions.

5 years agoMerge branch 'pr1777_squashed'
teor [Tue, 17 Mar 2020 11:08:45 +0000 (21:08 +1000)] 
Merge branch 'pr1777_squashed'

5 years agoConditionally disable part of hs_intropoint/introduce1_validation
rl1987 [Sat, 14 Mar 2020 17:00:54 +0000 (19:00 +0200)] 
Conditionally disable part of hs_intropoint/introduce1_validation

This makes it not fail when ALL_BUGS_ARE_FATAL is enabled. Fixes bug 33546.

5 years agoConditionally disable part of dir/param_voting_lookup that expects soft asserts to...
rl1987 [Sat, 14 Mar 2020 16:51:01 +0000 (18:51 +0200)] 
Conditionally disable part of dir/param_voting_lookup that expects soft asserts to happen

5 years agoTry fixing Windows build to work with ALL_BUGS_ARE_FATAL
rl1987 [Sat, 14 Mar 2020 14:43:08 +0000 (16:43 +0200)] 
Try fixing Windows build to work with ALL_BUGS_ARE_FATAL

5 years agoDocumentation fixups
rl1987 [Sat, 14 Mar 2020 14:25:59 +0000 (16:25 +0200)] 
Documentation fixups

5 years agoUse --enable-all-bugs-are-fatal on hardened Appveyor build
rl1987 [Sat, 14 Mar 2020 14:15:19 +0000 (16:15 +0200)] 
Use --enable-all-bugs-are-fatal on hardened Appveyor build

5 years agoDon't create new CI jobs; use --enable-all-bugs-are-fatal with some of the existing...
rl1987 [Sat, 14 Mar 2020 14:11:00 +0000 (16:11 +0200)] 
Don't create new CI jobs; use --enable-all-bugs-are-fatal with some of the existing jobs

5 years agoAdd --enable-all-bugs-are-fatal option to configure
rl1987 [Fri, 13 Mar 2020 18:24:54 +0000 (20:24 +0200)] 
Add --enable-all-bugs-are-fatal option to configure

This option enables the ALL_BUGS_ARE_FATAL macro.

And use --enable-all-bugs-are-fatal in the Travis configuration.

5 years agoRun "make autostyle"
teor [Tue, 17 Mar 2020 08:19:04 +0000 (18:19 +1000)] 
Run "make autostyle"

5 years agocircpad_setup_machine_on_circ(): exit early on error.
Nick Mathewson [Sat, 14 Mar 2020 18:44:33 +0000 (14:44 -0400)] 
circpad_setup_machine_on_circ(): exit early on error.

This function does a nonfatal assertion to make sure that a machine
is not registered twice, but Tobias Pulls found a case where it
happens.  Instead, make the function exit early so that it doesn't
cause a remotely triggered memory leak.

Fixes bug 33619; bugfix on 0.4.0.1-alpha.  This is also tracked as
TROVE-2020-004.

5 years agoMerge branch 'maint-0.4.3'
Nick Mathewson [Mon, 16 Mar 2020 16:21:57 +0000 (12:21 -0400)] 
Merge branch 'maint-0.4.3'

5 years agoMerge branch 'ticket32672_042_squashed_w_test' into maint-0.4.3
Nick Mathewson [Mon, 16 Mar 2020 16:21:49 +0000 (12:21 -0400)] 
Merge branch 'ticket32672_042_squashed_w_test' into maint-0.4.3

5 years agoAdjust unit tests for patch for 32672 (rejecting old version)
Nick Mathewson [Mon, 16 Mar 2020 14:42:40 +0000 (10:42 -0400)] 
Adjust unit tests for patch for 32672 (rejecting old version)

Patch by Neel Chauhan.

5 years agoMerge branch 'ticket32672_041_squashed' into ticket32672_042_squashed_w_test
Nick Mathewson [Mon, 16 Mar 2020 14:40:55 +0000 (10:40 -0400)] 
Merge branch 'ticket32672_041_squashed' into ticket32672_042_squashed_w_test

5 years agoReject 0.2.9 and 0.4.0 in dirserv_rejects_tor_version()
Neel Chauhan [Fri, 6 Dec 2019 00:06:35 +0000 (19:06 -0500)] 
Reject 0.2.9 and 0.4.0 in dirserv_rejects_tor_version()

5 years agoMerge branch 'maint-0.4.3'
teor [Mon, 16 Mar 2020 10:54:42 +0000 (20:54 +1000)] 
Merge branch 'maint-0.4.3'

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
teor [Mon, 16 Mar 2020 10:54:34 +0000 (20:54 +1000)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
teor [Mon, 16 Mar 2020 10:54:27 +0000 (20:54 +1000)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
teor [Mon, 16 Mar 2020 10:54:20 +0000 (20:54 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

5 years agoTravis: Produce detailed chutney diagnostics
teor [Mon, 17 Feb 2020 07:21:13 +0000 (17:21 +1000)] 
Travis: Produce detailed chutney diagnostics

When a Travis chutney job fails, use chutney's new "diagnostics.sh" tool
to produce detailed diagnostic output.

Closes ticket 32792.

5 years agoMerge branch 'trove_2020_002_035' into trove_2020_002_041
Nick Mathewson [Sat, 14 Mar 2020 18:20:51 +0000 (14:20 -0400)] 
Merge branch 'trove_2020_002_035' into trove_2020_002_041

5 years agoFix memory leak in crypto_pk_asn1_decode_private.
Nick Mathewson [Sat, 14 Mar 2020 18:17:33 +0000 (14:17 -0400)] 
Fix memory leak in crypto_pk_asn1_decode_private.

(Deep, deep thanks to Taylor for reminding me to test this!)

5 years agoAdd a test for crypto_pk_asn1_decode_private maxbits.
Nick Mathewson [Sat, 14 Mar 2020 17:50:38 +0000 (13:50 -0400)] 
Add a test for crypto_pk_asn1_decode_private maxbits.

5 years agoRevise TROVE-2020-002 fix to work on older OpenSSL versions.
Nick Mathewson [Sat, 14 Mar 2020 17:38:53 +0000 (13:38 -0400)] 
Revise TROVE-2020-002 fix to work on older OpenSSL versions.

Although OpenSSL before 1.1.1 is no longer supported, it's possible
that somebody is still using it with 0.3.5, so we probably shouldn't
break it with this fix.

5 years agoMerge branch 'maint-0.4.3'
Nick Mathewson [Fri, 13 Mar 2020 20:57:42 +0000 (16:57 -0400)] 
Merge branch 'maint-0.4.3'

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Fri, 13 Mar 2020 20:57:27 +0000 (16:57 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

"ours" to avoid version bump.

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Fri, 13 Mar 2020 20:57:03 +0000 (16:57 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

"ours" to avoid version bump.

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Fri, 13 Mar 2020 20:56:44 +0000 (16:56 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

"ours" to avoid version bump.

5 years agoBump to 0.3.5.10
Nick Mathewson [Fri, 13 Mar 2020 20:56:31 +0000 (16:56 -0400)] 
Bump to 0.3.5.10

5 years agoBump to 0.4.1.9
Nick Mathewson [Fri, 13 Mar 2020 20:56:22 +0000 (16:56 -0400)] 
Bump to 0.4.1.9

5 years agoBump to 0.4.2.7.
Nick Mathewson [Fri, 13 Mar 2020 20:56:06 +0000 (16:56 -0400)] 
Bump to 0.4.2.7.

5 years agoMerge branch 'maint-0.4.3'
Nick Mathewson [Fri, 13 Mar 2020 20:46:16 +0000 (16:46 -0400)] 
Merge branch 'maint-0.4.3'

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Fri, 13 Mar 2020 20:46:16 +0000 (16:46 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Fri, 13 Mar 2020 20:46:16 +0000 (16:46 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Fri, 13 Mar 2020 20:46:16 +0000 (16:46 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5
Nick Mathewson [Fri, 13 Mar 2020 20:46:09 +0000 (16:46 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5

5 years agoMerge branch 'maint-0.4.3'
Nick Mathewson [Fri, 13 Mar 2020 20:45:26 +0000 (16:45 -0400)] 
Merge branch 'maint-0.4.3'

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Fri, 13 Mar 2020 20:45:17 +0000 (16:45 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge remote-tracking branch 'tor-github/pr/1718/head' into maint-0.4.2
Nick Mathewson [Fri, 13 Mar 2020 20:42:47 +0000 (16:42 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1718/head' into maint-0.4.2

5 years agoconfig: Improve some comments
teor [Fri, 13 Mar 2020 08:53:48 +0000 (18:53 +1000)] 
config: Improve some comments

Document the namelen argument to port_cfg_new().

Fix a typo in a comment in port_cfg_line_extract_addrport().

Comment-only changes.

5 years agoMerge branch 'maint-0.4.3'
teor [Fri, 13 Mar 2020 03:01:31 +0000 (13:01 +1000)] 
Merge branch 'maint-0.4.3'

5 years agoMerge remote-tracking branch 'tor-github/pr/1735' into maint-0.4.3
teor [Fri, 13 Mar 2020 03:00:58 +0000 (13:00 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1735' into maint-0.4.3

5 years agoMerge branch 'pr1764_squashed'
teor [Fri, 13 Mar 2020 01:14:20 +0000 (11:14 +1000)] 
Merge branch 'pr1764_squashed'

5 years agoAdd a script to install the scripts in scripts/git appropriately.
Nick Mathewson [Tue, 25 Feb 2020 19:59:41 +0000 (14:59 -0500)] 
Add a script to install the scripts in scripts/git appropriately.

To run this, say something like

   TOR_DEVTOOL_DIR=~/bin scripts/git/git-install-tools.sh all

To see what it would do, give it the -n flag.

To get help, give it the -h flag.

5 years agoMerge branch 'maint-0.4.3'
Nick Mathewson [Thu, 12 Mar 2020 17:45:06 +0000 (13:45 -0400)] 
Merge branch 'maint-0.4.3'

5 years agoMerge branch 'ticket33361_035_01_squashed' into maint-0.4.3
Nick Mathewson [Thu, 12 Mar 2020 17:42:42 +0000 (13:42 -0400)] 
Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3

5 years agoFix unit tests that look at contactinfo logs.
Nick Mathewson [Thu, 12 Mar 2020 17:42:17 +0000 (13:42 -0400)] 
Fix unit tests that look at contactinfo logs.

5 years agoMerge branch 'maint-0.4.3'
Nick Mathewson [Thu, 12 Mar 2020 16:46:12 +0000 (12:46 -0400)] 
Merge branch 'maint-0.4.3'

5 years agoMerge branch 'ticket33361_035_01_squashed' into maint-0.4.3
Nick Mathewson [Thu, 12 Mar 2020 16:45:56 +0000 (12:45 -0400)] 
Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3

Conflicts:
        src/app/config/config.c

5 years agoconfig: Warn if ContactInfo is not set
David Goulet [Tue, 18 Feb 2020 14:43:13 +0000 (09:43 -0500)] 
config: Warn if ContactInfo is not set

Closes #33361

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agohs-v3: Log reasons why service can't upload descriptor
David Goulet [Thu, 20 Feb 2020 16:41:53 +0000 (11:41 -0500)] 
hs-v3: Log reasons why service can't upload descriptor

When a service can not upload its descriptor(s), we have no logs on why. This
adds logging for each possible reason for each descriptors.

That logging is emitted every second so it is rate limited for each reason and
per descriptor.

Closes #33400

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agodos: Pass transport name on new client connection
David Goulet [Tue, 10 Mar 2020 18:45:13 +0000 (14:45 -0400)] 
dos: Pass transport name on new client connection

For a bridge configured with a pluggable transport, the transport name is
used, with the IP address, for the GeoIP client cache entry.

However, the DoS subsystem was not aware of it and always passing NULL when
doing a lookup into the GeoIP cache.

This resulted in bridges with a PT are never able to apply DoS defenses for
newly created connections.

Fixes #33491

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoMerge branch 'maint-0.4.3'
Nick Mathewson [Tue, 10 Mar 2020 14:28:30 +0000 (10:28 -0400)] 
Merge branch 'maint-0.4.3'

"ours" to avoid version bump.

5 years agoBump to 0.4.3.3-alpha.
Nick Mathewson [Tue, 10 Mar 2020 14:28:09 +0000 (10:28 -0400)] 
Bump to 0.4.3.3-alpha.

5 years agoMerge branch 'maint-0.4.3'
David Goulet [Tue, 10 Mar 2020 13:14:44 +0000 (09:14 -0400)] 
Merge branch 'maint-0.4.3'

5 years agoTweak double-underscore
rl1987 [Mon, 9 Mar 2020 18:51:46 +0000 (20:51 +0200)] 
Tweak double-underscore

5 years agoDocument poll_interval_tv in procmon.c
rl1987 [Mon, 9 Mar 2020 14:03:43 +0000 (16:03 +0200)] 
Document poll_interval_tv in procmon.c

5 years agoDocument __OwningControllerProcess torrc option and mention polling interval
rl1987 [Mon, 9 Mar 2020 14:00:50 +0000 (16:00 +0200)] 
Document __OwningControllerProcess torrc option and mention polling interval

5 years agoMerge branch 'tor-github/pr/1723'
David Goulet [Mon, 9 Mar 2020 14:36:05 +0000 (10:36 -0400)] 
Merge branch 'tor-github/pr/1723'

5 years agoMerge branch 'tor-github/pr/1751'
David Goulet [Mon, 9 Mar 2020 13:33:05 +0000 (09:33 -0400)] 
Merge branch 'tor-github/pr/1751'