Nick Mathewson
1bbe75da6d
Merge remote-tracking branch 'teor/bug25998' into maint-0.3.3
2018-05-03 13:37:33 -04:00
Nick Mathewson
c66b512671
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-02 08:46:28 -04:00
Nick Mathewson
246765342e
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-02 08:46:28 -04:00
Nick Mathewson
993e314c6f
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-02 08:46:28 -04:00
teor
d465bd27ed
Stop logging stack contents when reading a zero-length bandwidth file
...
When directory authorities read a zero-byte bandwidth file, they log
a warning with the contents of an uninitialised buffer. Log a warning
about the empty file instead.
Fixes bug 26007; bugfix on 0.2.2.1-alpha.
2018-05-02 22:36:23 +10:00
teor
d96ddf8f1b
man page: FetchUselessDescriptors and DirCache exclude extra infos
2018-05-02 11:29:48 +10:00
teor
4a7590c241
man page: UseMicrodescriptors auto and 1 are the same now
2018-05-02 10:46:10 +10:00
teor
9b1d5e8826
man page: FetchUselessDescriptors stops tor going idle
...
Also explain how FetchUselessDescriptors and UseMicrodescriptors are
different.
Closes 25998.
2018-05-02 10:46:00 +10:00
teor
b116710e31
Stop initialising rust submodules, travis does this for us
...
Fixes #24630 .
2018-04-27 13:26:12 -04:00
Nick Mathewson
58f54a3588
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-25 08:01:54 -04:00
Nick Mathewson
7c3f87eb4b
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-25 08:01:53 -04:00
Nick Mathewson
bb35405d2a
Fix a copy-paste error in the fix for #23693 .
...
Found by coverity; CID 25912; bug not in any released Tor.
2018-04-25 08:00:55 -04:00
Nick Mathewson
85cd8386fa
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-24 10:38:37 -04:00
Nick Mathewson
89a3fafd49
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-24 10:38:37 -04:00
Nick Mathewson
5cc3a0379e
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-24 10:38:37 -04:00
Nick Mathewson
d44753b0e8
Merge branch 'travis_distcheck_033' into maint-0.3.3
2018-04-24 10:38:34 -04:00
Nick Mathewson
34e7dca9c9
Merge branch 'travis_distcheck_029' into maint-0.2.9
2018-04-24 10:38:19 -04:00
Nick Mathewson
7e7b052b2a
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-24 10:37:36 -04:00
Nick Mathewson
9187cdb1cd
Merge remote-tracking branch 'dgoulet/bug25901_032_01' into maint-0.3.2
2018-04-24 10:36:17 -04:00
Nick Mathewson
6182f60f75
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-24 08:51:55 -04:00
Nick Mathewson
d2951b381b
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-24 08:49:24 -04:00
Nick Mathewson
e888634076
Merge remote-tracking branch 'public/bug23693_031_redux' into maint-0.3.1
2018-04-24 08:49:20 -04:00
David Goulet
b259008c56
hs: Fix memleak in v3 on SIGHUP
...
Fixes #25901
Signed-off-by: David Goulet <dgoulet@torproject.org >
2018-04-23 11:09:57 -04:00
Nick Mathewson
e8683bcbb1
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-23 09:24:33 -04:00
Nick Mathewson
1438c6c713
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-23 09:23:31 -04:00
Nick Mathewson
5c3639923f
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-23 09:23:31 -04:00
Nick Mathewson
9727b4c5d6
Merge branch 'bug24969_029_v2' into maint-0.2.9
2018-04-23 09:23:25 -04:00
Nick Mathewson
c4be6dfeab
Permit the nanosleep system call in the seccomp2 callbox
...
Fixes bug 24969; bugfix on 0.2.5.1-alpha when the sandbox was introduced.
2018-04-23 09:15:40 -04:00
Nick Mathewson
c3e40a8361
Allow cpuworkers to exist without onion keys
...
Now that we allow cpuworkers for dirport-only hosts (to fix 23693),
we need to allow dup_onion_keys() to succeed for them.
The change to construct_ntor_key_map() is for correctness,
but is not strictly necessary.
2018-04-22 17:17:07 -04:00
Nick Mathewson
cb813a352c
Fix documentation bug 25857: the universe is ::/0, not ::/128
...
Patch from CTassisF.
2018-04-20 14:35:33 -04:00
Nick Mathewson
d5d312884f
Merge branch 'travis_distcheck_031' into travis_distcheck_033
2018-04-18 18:37:59 -04:00
Nick Mathewson
f32ac2aaf5
Test the with-rust and without-rust distcheck variants
2018-04-18 18:37:37 -04:00
Nick Mathewson
bf466f5503
Merge branch 'travis_distcheck_029' into travis_distcheck_033
2018-04-18 18:34:28 -04:00
Nick Mathewson
96bc96ceeb
Merge branch 'travis_distcheck_029' into travis_distcheck_031
2018-04-18 17:35:41 -04:00
Nick Mathewson
6125133715
Add distcheck support to travis configuration.
...
Implements 25814.
2018-04-18 17:33:19 -04:00
Nick Mathewson
f0230ee38a
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-17 10:48:18 -04:00
Nick Mathewson
44aa586dea
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-17 10:48:18 -04:00
Nick Mathewson
ce8e7427b9
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-17 10:48:08 -04:00
David Goulet
93ff1870ba
heartbeat: Log the number of circuits killed because too many cells
...
We recently merged a circuit cell queue size safeguard. This commit adds the
number of killed circuits that have reached the limit to the DoS heartbeat. It
now looks like this:
[notice] DoS mitigation since startup: 0 circuits killed with too many
cells. 0 circuits rejected, 0 marked addresses. 0 connections closed. 0
single hop clients refused.
Second thing that this patch does. It makes tor always print the DoS
mitigation heartbeat line (for a relay) even though no DoS mitigation have
been enabled. The reason is because we now kill circuits that have too many
cells regardless on if it is enabled or not but also it will give the operator
a chance to learn what is enabled with the heartbeat instead of suddenly
appearing when it is enabled by let say the consensus.
Fixes #25824
Signed-off-by: David Goulet <dgoulet@torproject.org >
2018-04-17 10:44:43 -04:00
Nick Mathewson
d3ff126309
Add support for the coveralls.io coverage tool in travis config
...
Closes ticket 25818.
2018-04-16 14:42:28 -04:00
Nick Mathewson
c5899d5cf3
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-16 13:48:23 -04:00
Nick Mathewson
5e0fbd7006
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-16 13:48:23 -04:00
Nick Mathewson
9ef4c05df8
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-16 13:48:23 -04:00
Nick Mathewson
0e13ff4815
Fix an LCOV exclusion pattern in address.c
2018-04-16 13:48:21 -04:00
Nick Mathewson
22845df2a7
Merge remote-tracking branch 'dgoulet/bug25226_033_02' into maint-0.3.3
2018-04-16 10:04:36 -04:00
David Goulet
d064122e70
relay: Implement a circuit cell queue maximum size
...
This commit introduces the consensus parameter "circ_max_cell_queue_size"
which controls the maximum number of cells a circuit queue should have.
The default value is currently 50000 cells which is above what should be
expected but keeps us a margin of error for padding cells.
Related to this is #9072 . Back in 0.2.4.14-alpha, we've removed that limit due
to a Guard discovery attack. Ticket #25226 details why we are putting back the
limit due to the memory pressure issue on relays.
Fixes #25226
Signed-off-by: David Goulet <dgoulet@torproject.org >
2018-04-16 09:59:12 -04:00
Nick Mathewson
3ee4c9b1fa
bump to 0.3.3.5-rc-dev
2018-04-15 15:41:03 -04:00
Nick Mathewson
b65024f57d
bump to 0.3.3.5-rc
2018-04-14 12:21:36 -04:00
Nick Mathewson
4d8de6c6be
Merge remote-tracking branch 'dgoulet/ticket25248_033_02' into maint-0.3.3
2018-04-13 13:09:11 -04:00
Mike Perry
21b347e291
doc: Fix typo and clarify that DoS options are relay only
2018-04-13 12:22:02 -04:00