Nick Mathewson
c151f46445
Merge branch 'ticket20119'
2017-09-08 08:56:53 -04:00
Nick Mathewson
ad3f0953e6
Merge branch 'maint-0.3.1'
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
f5092e711f
Merge branch 'maint-0.2.9' into maint-0.3.0
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
54fb1d0f7f
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-07 15:18:01 -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
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
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
David Goulet
651629cbdf
config: Make parse_outbound_addresses() return failures
...
The function was never returning an error code on failure to parse the
OutboundAddress* options.
In the process, it was making our test_options_validate__outbound_addresses()
not test the right thing.
Fixes #23366
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-08-31 08:29:09 -04:00
Nick Mathewson
a58a41c15a
Changes file for bug22752 (simple version)
2017-08-29 13:09:39 -04:00
Nick Mathewson
209bfe715c
Merge branch 'maint-0.3.1'
2017-08-29 11:11:12 -04:00
David Goulet
6507ecb7e8
hs: Fix the intro circuit max retry
...
Some parentheses were missing making the rend_max_intro_circs_per_period()
return a lower value than it was suppose to.
The calculation is that a service at most will open a number of intro points
that it wants which is 3 by default or HiddenServiceNumIntroductionPoints. Two
extra are launched for performance reason. Finally, this can happen twice for
two descriptors for the current and next time period.
From:
2 * n_intro_wanted + 2
...which resulted in 8 for 3 intro points, this commit fixes it to:
(n_intro_wanted + 2) * 2
... resulting in 12 possible intro point circuit which is the correct maximum
intro circuit allowed per period.
Last, this commit rate limits the the log message if we ever go above that
limit else over a INTRO_CIRC_RETRY_PERIOD, we can print it often!
Fixes #22159
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-08-28 14:43:42 -04:00
Nick Mathewson
63fc23f826
Merge branch 'ticket22348_031' into maint-0.3.1
2017-08-28 11:44:18 -04:00
Nick Mathewson
c107aae3c2
Merge branch 'ticket22348_031'
2017-08-28 11:43:55 -04:00
Nick Mathewson
4b4b3afb56
Merge branch 'bug22802_squashed'
2017-08-28 10:23:05 -04:00
Nick Mathewson
e37c1df9cd
Don't use "0" as a "base" argument to tor_parse_*().
...
Telling these functions to autodetect the numeric base has lead to
trouble in the past.
Fixes bug 22469. Bugfix on 0.2.2.various.
2017-08-28 10:21:29 -04:00
Nick Mathewson
f2f1cab2b3
Restore documentation for approved-routers
...
We removed this documentation in 607724c696
, when we removed
Naming Authoritative Directories, but actually this file is still
used by authorities to indicate rejected and invalid fingerprints.
Closes ticket 21148.
2017-08-25 12:35:38 -04:00
Nick Mathewson
96aed28f14
New GETINFO target to check if geoip is loaded
...
Closes ticket 23237.
2017-08-25 12:25:05 -04:00
Nick Mathewson
b91dce9454
Merge branch 'maint-0.3.1'
2017-08-25 11:39:38 -04:00
Nick Mathewson
6069c829f9
Merge branch 'bug19418_029' into maint-0.3.1
2017-08-25 11:38:24 -04:00
Nick Mathewson
408ed52e3d
Remove the AUTHDIR_NEWDESCS feature: nobody is using it any more
...
If somebody asks for it, log a warning.
Closes ticket 22377.
2017-08-24 16:53:35 -04:00
Nick Mathewson
e7c1a6f4f7
Changes file for 22497
2017-08-24 16:11:08 -04:00
Nick Mathewson
b5c5086aba
Merge branch 'bug23106_032'
2017-08-24 09:45:03 -04:00
Nick Mathewson
35a29e81ae
Merge branch 'bug19281_025'
2017-08-24 09:27:26 -04:00
Nick Mathewson
d37e8b407a
Merge branch 'feature22976_squashed'
2017-08-24 09:23:43 -04:00
Nick Mathewson
a0bb1ff6ab
Also disable spawning on Sandbox.
...
This isn't a functional change, but it makes our logic more clear,
and catches bugs earlier.
2017-08-24 09:23:32 -04:00
Nick Mathewson
f4f828640f
Merge branch 'bug22779_031'
2017-08-24 09:18:39 -04:00
Nick Mathewson
53c82c0821
Merge branch 'bug22677'
2017-08-24 09:18:03 -04:00