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
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
d3ac47b415
Merge branch 'maint-0.3.1' into maint-0.3.2
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
Nick Mathewson
ec8ee54129
Merge branch 'bug21394_029_redux' into maint-0.3.3
2018-04-04 08:55:37 -04:00
Dhalgren
06484eb5e1
Bug 21394 touchup: Increase DNS attempts to 3
...
Also don't give up on a resolver as quickly if multiple are configured.
2018-04-04 08:54:25 -04:00
Nick Mathewson
753840a8a7
Merge branch 'maint-0.3.3' into release-0.3.3
2018-04-03 19:03:38 -04:00
Nick Mathewson
7ccb1c5a85
add a missing word
2018-04-03 15:31:30 -04:00
Isis Lovecruft
b503df2775
changes: Add changes file for #24031 .
...
(cherry picked from commit 5a8cdec3f8 )
2018-04-03 19:21:25 +00:00
Nick Mathewson
5bdc18b2df
Merge branch 'maint-0.3.3' into release-0.3.3
2018-04-02 08:51:47 -04:00
Roger Dingledine
961d2ad597
dir auths no longer vote Guard if they're not voting V2Dir
...
Directory authorities no longer vote in favor of the Guard flag
for relays that don't advertise directory support.
Starting in Tor 0.3.0.1-alpha, Tor clients have been avoiding using
such relays in the Guard position, leading to increasingly broken load
balancing for the 5%-or-so of Guards that don't advertise directory
support.
Fixes bug 22310; bugfix on 0.3.0.6.
2018-04-02 00:20:01 -04:00
Nick Mathewson
6d7c4c6ec2
Remove erroneous section heading "ExitPolicyDefault"
...
The anchor here was originally introduced to make sure that the
manpage would format correctly, but we had mistaken it for a section
anchor, and introduced a bogus section heading in 3563a2c819 .
Fixes bug 25582; bugfix on 0.3.3.1-alpha.
2018-03-29 15:06:07 -04:00
Nick Mathewson
720f044a29
Merge branch 'maint-0.3.3' into release-0.3.3
2018-03-29 14:59:01 -04:00
Nick Mathewson
4f473fadbd
Merge branch 'bug25617_029' into maint-0.3.3
2018-03-29 14:58:58 -04:00
Nick Mathewson
e35eb9baaa
Mark controller-initiated DNS lookups as permitted to do DNS.
...
Fixes bug 25617; bugfix on 0.2.9.3-alpha.
2018-03-29 09:27:28 -04:00
Nick Mathewson
7b1eda3f67
Draft changelog for 0.3.3.4-alpha.
2018-03-29 08:16:15 -04:00
Nick Mathewson
2504c2d4ae
Merge branch 'maint-0.3.3' into release-0.3.3
2018-03-28 14:23:06 -04:00
Nick Mathewson
e0bbef48bf
Merge remote-tracking branch 'dgoulet/bug24767_033_03' into maint-0.3.3
2018-03-28 14:21:04 -04:00
Nick Mathewson
e31487b4ed
Merge branch 'maint-0.3.3' into release-0.3.3
2018-03-28 08:11:46 -04:00
Nick Mathewson
3cc382b93e
add a changes file for the rust libc update
2018-03-28 08:10:54 -04:00