Nick Mathewson
de6f121b59
Deprecate ReachableDirAddresses and ClientPreferIPv6DirPort
...
Closes ticket 19704.
2017-09-12 16:12:15 -04:00
Nick Mathewson
d165812416
remove a redundant changes file for 22750
2017-09-12 15:39:06 -04:00
Nick Mathewson
26d462c1f0
Merge branch 'ticket21031'
2017-09-12 10:43:34 -04:00
Nick Mathewson
4027bd2e96
Merge branch 'bug23347_squashed'
2017-09-12 10:38:35 -04:00
teor
93a8ed3b83
Make clients wait to refresh bridges when they have a recent descriptor
...
But when clients are just starting, make them try each bridge a few times
before giving up on it.
These changes make the bridge download schedules more explicit: before
17750, they relied on undocumented behaviour and specific schedule
entries. (And between 17750 and this fix, they were broken.)
Fixes 23347, not in any released version of tor.
2017-09-12 10:38:25 -04:00
teor
97249c4f5e
Make bridge clients download bridge descriptors immediately
...
The download schedule tells Tor to wait 15 minutes before downloading
bridge descriptors. But 17750 made Tor ignore that and start immediately.
Since we fixed 17750, Tor waits 15 minutes for bridge client bootstrap,
like the schedule says.
This fixes the download schedule to start immediately, and to try each
bridge 3 times in the first 30 seconds. This should make bridge bootstraps
more reliable.
Fixes 23347.
2017-09-12 10:38:25 -04:00
Nick Mathewson
8eef7fc845
Merge branch 'maint-0.3.1'
2017-09-12 10:30:54 -04:00
Nick Mathewson
befddf6d2a
Merge branch 'ticket17857_squashed' into maint-0.3.1
2017-09-12 10:29:00 -04:00
Mike Perry
6689c95d06
Changes file for #17857 .
2017-09-12 10:28:45 -04:00
Nick Mathewson
5238210da4
changes file for 22215
2017-09-12 09:58:07 -04:00
Nick Mathewson
4ace1b96ac
Add a changes file for 22437.
2017-09-12 09:31:57 -04:00
Nick Mathewson
eaa8224cef
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-11 17:49:18 -04:00
Nick Mathewson
e3caad0ea1
Merge branch 'maint-0.3.1'
2017-09-11 17:49:18 -04:00
Nick Mathewson
2b26815e09
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-11 17:49:18 -04:00
Andreas Stieger
b81a2e8f46
Fix GCC 7 -Wimplicit-fallthrough warnings (32 bit)
...
Add magic comments recognized by default -Wimplicit-fallthrough=3
Follow-up to e5f464, fixes Ticket 22446 for 32 bit.
[nick notes: Backport from 0.3.1.3-alpha.]
2017-09-11 17:45:07 -04:00
Nick Mathewson
c894e9d3d4
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-11 16:29:10 -04:00
Nick Mathewson
a25d97e530
Merge branch 'teor-bug22797-025' into maint-0.2.9
2017-09-11 16:28:59 -04:00
Nick Mathewson
b9ecb522fc
Merge branch 'ticket22281_squashed'
2017-09-11 16:23:24 -04:00
Nick Mathewson
c4cb969a2a
Taboo the get_options() function while options are validating
...
When option validation or transition is happening, there are no
"current options" -- only "old options" and "maybe new options".
Looking at get_options() is likely a mistake, so have a nonfatal
assertion let us know if we do that.
Closes 22281.
2017-09-11 16:23:16 -04:00
Nick Mathewson
c151f46445
Merge branch 'ticket20119'
2017-09-08 08:56:53 -04:00
Nick Mathewson
f5092e711f
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-08 08:24:47 -04:00
Nick Mathewson
7a83cf75dc
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-08 08:24:47 -04:00
Nick Mathewson
ad3f0953e6
Merge branch 'maint-0.3.1'
2017-09-08 08:24:47 -04:00
Nick Mathewson
3cace828a9
Merge branch 'bug22644_029' into maint-0.2.9
2017-09-08 08:24:36 -04:00
Nick Mathewson
eebfe4f539
Merge branch 'ticket22731'
2017-09-08 08:11:11 -04:00
Nick Mathewson
1b1eeb0fb9
Merge branch 'feature23237'
2017-09-08 08:10:15 -04:00
Nick Mathewson
22e6880296
Merge branch 'ticket22377'
2017-09-08 08:06:44 -04:00
Nick Mathewson
a9d4df9a08
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-07 15:18:01 -04:00
Nick Mathewson
54fb1d0f7f
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-07 15:18:01 -04:00
Nick Mathewson
36104e55e4
Merge branch 'maint-0.3.1'
2017-09-07 15:18:01 -04:00
Nick Mathewson
08592c95fa
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-09-07 15:18:00 -04:00
Nick Mathewson
bcf2b413c3
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-09-07 15:18:00 -04:00
Karsten Loesing
09618ffe38
Update geoip and geoip6 to the September 6 2017 database.
2017-09-07 21:06:16 +02:00
Nick Mathewson
283be00b0b
Add support for running "calltool" on Tor via "make callgraph".
...
Closes #19307 .
2017-09-07 10:51:02 -04:00
Nick Mathewson
27fa4a98d2
Make ClientDNSRejectInternalAddresses testing-only.
...
Undeprecate it;
rename it to TestingClientDNSRejectInternalAddresses;
add the old name as an alias;
reject configurations where it is set but TestingTorNetwork is not;
change the documentation accordingly.
Closes tickets 21031 and 21522.
2017-09-07 10:03:31 -04:00
Nick Mathewson
12dad5ebf7
Fix crashes on empty +HSPOST and +POSTDESCRIPTOR commands
...
Fixes bug 22644; bugfix on 0.2.7.1-alpha and 0.2.0.1-alpha
respectively.
2017-09-07 09:20:00 -04:00
Nick Mathewson
1e079ec30d
Merge branch 'maint-0.3.1'
2017-09-07 08:51:16 -04:00
Nick Mathewson
9c404602a0
Add a stack trace to the warning at issue with 23105.
...
With luck, this will help us diagnose 23105 and fix it.
I also added a stack trace to the warning right before it, since why
not.
2017-09-07 08:49:11 -04:00
Nick Mathewson
ab18e5e5fc
Better error on failure to load seccomp2 sandbox
...
There are two reasons this is likeliest to happen -- no kernel
support, and some bug in Tor. We'll ask people to check the former
before they report. Closes 23090.
2017-09-06 14:23:47 -04:00
Nick Mathewson
1098893e4f
Exit when we can't write to a configured pid file
...
This is probably what the user wants, according to 20119.
2017-09-06 11:50:22 -04:00
Nick Mathewson
6fea44c673
Reject torrc if RunAsDaemon is given with relative paths.
...
The chdir() call in RunAsDaemon makes the behavior here surprising,
and either way of trying to resolve the surprise seems sure to
startle a significant fraction of users. Instead, let's refuse to
guess, and refuse these configurations.
Closes ticket 22731.
2017-09-06 11:39:11 -04:00
Nick Mathewson
73b0e2e6fd
Merge branch 'http_tunnel_squashed'
2017-09-05 14:34:29 -04:00
Nick Mathewson
fead644956
Add a manpage entry and changes file for for HTTPTunnelPort
2017-09-05 14:34:09 -04:00
Nick Mathewson
234c5015f1
Move protocol-specific functions out of buffers.c
...
This commit does not change the implementation of any function: it
only moves code and adds new includes as necessary. Part of #23149 .
2017-09-05 13:57:51 -04:00
Nick Mathewson
e2969759a7
Remove changes files that are already merged in 0.3.1.6-rc
2017-09-05 10:43:17 -04:00
Nick Mathewson
42394053c9
Merge branch 'maint-0.3.1'
2017-09-04 15:48:12 -04:00
Nick Mathewson
4d97efd4d1
Merge branch 'bug22752_031_simple' into maint-0.3.1
2017-09-04 15:48:01 -04:00
Nick Mathewson
33989cd002
Merge remote-tracking branch 'dgoulet/bug23366_032_01'
2017-09-04 12:48:26 -04:00
Nick Mathewson
e2e13e7c8a
Merge branch 'maint-0.3.1'
2017-09-04 11:40:02 -04:00
Nick Mathewson
a7aeb6f58f
Merge remote-tracking branch 'public/bug23275_031' into maint-0.3.1
2017-09-04 11:39:28 -04:00