Nick Mathewson
84ff776893
Merge branch 'maint-0.3.3' into release-0.3.3
2018-04-20 14:39:48 -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
d8a9c9f2c8
Merge branch 'maint-0.3.3' into release-0.3.3
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
f0230ee38a
Merge branch 'maint-0.3.1' into maint-0.3.2
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
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
8ae9ed6287
Merge branch 'maint-0.3.3' into release-0.3.3
2018-04-16 10:06: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
1856f3e11e
Begin work on 0.3.3.5-rc changelog
2018-04-14 12:23:51 -04:00
Nick Mathewson
f95f6a4498
Merge branch 'maint-0.3.3' into release-0.3.3
2018-04-13 13:09:15 -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
Nick Mathewson
50406c2720
Merge branch 'maint-0.3.3' into release-0.3.3
2018-04-13 13:05:53 -04:00
David Goulet
119b053a8a
doc: Improve DoS section of the man page tor.1
...
Add to the Denial of Service section of the man page an explanation about the
three different mitigation Tor has.
Fixes #25248 .
Signed-off-by: David Goulet <dgoulet@torproject.org >
2018-04-13 12:20:59 -04:00
Nick Mathewson
2d6914e391
Refine extend_info_for_node's "enough info" check once again.
...
In d1874b4339 , we adjusted this check so that we insist on
using routerinfos for bridges. That's almost correct... but if we
have a bridge that is also a regular relay, then we should use
insist on its routerinfo when connecting to it as a bridge
(directly), and be willing to use its microdescriptor when
connecting to it elsewhere in our circuits.
This bug is a likely cause of some (all?) of the (exit_ei == NULL)
failures we've been seeing.
Fixes bug 25691; bugfix on 0.3.3.4-alpha
2018-04-12 16:56:29 -04:00
Nick Mathewson
85db0c46eb
Merge branch 'maint-0.3.3' into release-0.3.3
2018-04-12 11:14:42 -04:00
Alexander Færøy
31508a0abc
Use less memory for MaxMemInQueues for machines with more than 8 GB of RAM.
...
This patch changes the algorithm of compute_real_max_mem_in_queues() to
use 0.4 * RAM iff the system has more than or equal to 8 GB of RAM, but
will continue to use the old value of 0.75 * RAM if the system have less
than * GB of RAM available.
This patch also adds tests for compute_real_max_mem_in_queues().
See: https://bugs.torproject.org/24782
2018-04-12 11:14:16 -04:00
Nick Mathewson
572077b7fd
Merge branch 'maint-0.3.3' into release-0.3.3
2018-04-11 15:38:00 -04:00
Nick Mathewson
0803d79f55
Merge branch 'bug25581_033_v2_asn_squashed' into maint-0.3.3
2018-04-11 15:37:56 -04:00
Nick Mathewson
8b8630a501
Rename HSLayer{2,3}Nodes to start without an underscore.
...
The old single-underscore names remain as a deprecated synonym.
Fixes bug 25581; bugfix on 0.3.3.1-alpha.
2018-04-11 15:37:49 -04:00
Nick Mathewson
6a0b31e5a7
Merge branch 'maint-0.3.3' into release-0.3.3
2018-04-11 10:48:46 -04:00
Mike Perry
f9ba0c6546
Bug 24989: Count client hsdir gets towards MaxClientCircuitsPending.
...
We removed this by breaking them out from general in #13837 .
2018-04-11 10:47:06 -04:00
Nick Mathewson
d3ac47b415
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-10 14:26:32 -04:00
Nick Mathewson
3230814d2b
Merge branch 'maint-0.3.3' into release-0.3.3
2018-04-10 14:26:32 -04:00
Nick Mathewson
0b1a054d68
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-10 14:26:32 -04:00
Nick Mathewson
db6902c235
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-10 14:26:29 -04:00
Nick Mathewson
10a1969ca3
Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9
2018-04-10 14:25:57 -04:00
Alexander Færøy
1295044dc8
Lift the list of default directory servers into their own file.
...
This patch lifts the list of default directory authorities from config.c
into their own auth_dirs.inc file, which is then included in config.c
using the C preprocessor.
Patch by beastr0.
See: https://bugs.torproject.org/24854
2018-04-09 16:00:26 +02:00
Nick Mathewson
f467771634
Merge branch 'maint-0.3.3' into release-0.3.3
2018-04-06 16:18:47 -04:00
Nick Mathewson
306563ac68
Ship all files needed to build Tor with rust
...
Fixes bug 25732; bugfix on 0.3.3.2-alpha when strings.rs was
introduced.
2018-04-06 16:18:11 -04:00
Nick Mathewson
98a0498490
Merge branch 'maint-0.3.3' into release-0.3.3
2018-04-05 12:09:00 -04:00
Nick Mathewson
12fc4206f2
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-05 12:09:00 -04:00
Nick Mathewson
124e06e85c
Merge branch 'ticket25296_032_squashed' into maint-0.3.2
2018-04-05 12:08:53 -04:00
Nick Mathewson
c2d93e8a7d
PerConnBW{Rate,Burst} docs: do not say consensus param is always set
...
Closes ticket 25296; bugfix on 0.2.2.7-alpha when these manpage
entries were introduced.
2018-04-05 12:08:35 -04:00
Nick Mathewson
ad0bc6e54c
Merge branch 'maint-0.3.3' into release-0.3.3
2018-04-05 08:36:13 -04:00
Nick Mathewson
2dee38fba0
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-05 08:36:13 -04:00
Nick Mathewson
df519e5de8
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-05 08:36:13 -04:00
Taylor Yu
e813116d3d
Switch Travis to stable rust
2018-04-05 08:36:09 -04:00
Nick Mathewson
876b4b168a
Merge branch 'maint-0.3.3' into release-0.3.3
2018-04-05 08:22:34 -04:00
Nick Mathewson
78bf564168
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-05 08:22:34 -04:00
Nick Mathewson
9b10eb2d7a
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-05 08:22:34 -04:00
Nick Mathewson
834eef2452
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-05 08:22:34 -04:00
Nick Mathewson
b68e636b33
Merge branch 'maint-0.2.5' into maint-0.2.9
2018-04-05 08:22:33 -04:00
Nick Mathewson
8a8b4ae69b
Merge branch 'maint-0.3.3' into release-0.3.3
2018-04-05 08:21:43 -04:00
Nick Mathewson
ac3e389dbd
Merge remote-tracking branch 'dgoulet/bug25582_033' into maint-0.3.3
2018-04-05 08:21:38 -04:00
Nick Mathewson
8f798b686d
Merge branch 'bug25679_033_squashed' into maint-0.3.3
2018-04-05 08:20:15 -04:00
Nick Mathewson
e3ad4957a8
Fix the default for TOR_RUST_DEPENDENCIES
...
By default, we want to look at the crates directory of the
submodule, not the toplevel of the submodule. Fixes bug 25679;
bugfix on 0.3.3.1-alpha.
2018-04-05 08:20:07 -04:00
Karsten Loesing
1fa396b0a4
Update geoip and geoip6 to the April 3 2018 database.
2018-04-05 10:42:25 +02:00
Nick Mathewson
01037c106d
Merge branch 'maint-0.3.3' into release-0.3.3
2018-04-04 08:57:24 -04:00