Nick Mathewson
54e42fe364
Merge branch 'maint-0.4.0'
2019-02-21 10:08:14 -05:00
David Goulet
be84ed1a64
kist: Don't write above the highwater outbuf mark
...
KIST works by computing how much should be allowed to write to the kernel for
a given socket, and then it writes that amount to the outbuf.
The problem is that it could be possible that the outbuf already has lots of
data in it from a previous scheduling round (because the kernel is full/busy
and Tor was not able to flush the outbuf yet). KIST ignores that the outbuf
has been filling (is above its "highwater") and writes more anyway. The end
result is that the outbuf length would exceed INT_MAX, hence causing an
assertion error and a corresponding "Bug()" message to get printed to the
logs.
This commit makes it for KIST to take into account the outbuf length when
computing the available space.
Bug found and patch by Rob Jansen.
Closes #29168 . TROVE-2019-001.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-02-21 10:07:34 -05:00
Nick Mathewson
b3416476b4
Remove all uses of weak_rng.
...
I'm not removing the weak_rng code itself yet, since it is possible
that we will want to revert one of these.
2019-02-20 12:24:34 -05:00
David Goulet
59c3910bec
Merge branch 'tor-github/pr/695'
2019-02-20 12:15:26 -05:00
David Goulet
d259194c82
Merge branch 'tor-github/pr/658'
2019-02-20 12:09:52 -05:00
David Goulet
da179088ee
Merge branch 'tor-github/pr/687'
2019-02-20 12:09:02 -05:00
David Goulet
7037fe1163
Merge branch 'tor-github/pr/700'
2019-02-20 12:06:39 -05:00
rl1987
b7ad8bcaad
Use setrlimit instead of ulimit -c in backtrace tests
2019-02-20 12:06:26 -05:00
David Goulet
8f5a3c0460
Merge branch 'tor-github/pr/675'
2019-02-20 11:45:58 -05:00
David Goulet
a30f17f72f
Merge branch 'tor-github/pr/696'
2019-02-20 11:29:55 -05:00
Roger Dingledine
4d4eda89a1
Merge branch 'maint-0.4.0'
2019-02-20 10:36:54 -05:00
Roger Dingledine
249319ec5d
fix typos from #28614
2019-02-20 10:32:47 -05:00
Nick Mathewson
b25cd5cfe1
Implement code to manage a per-thread instance of crypto_fast_rng()
...
The subsystems API makes this really simple, fortunately.
Closes ticket 29536
2019-02-19 15:36:08 -05:00
Nick Mathewson
6927e9a60c
Merge remote-tracking branch 'tor-github/pr/665'
2019-02-19 11:56:48 -05:00
Nick Mathewson
0fc5fdc430
Merge remote-tracking branch 'tor-github/pr/659'
2019-02-19 11:55:53 -05:00
Nick Mathewson
97e1539f7f
Merge remote-tracking branch 'tor-github/pr/706' into maint-0.4.0
2019-02-19 11:53:02 -05:00
Nick Mathewson
c3fca4e4b3
Merge branch 'maint-0.4.0'
2019-02-19 11:51:24 -05:00
Nick Mathewson
4df31adef7
Merge remote-tracking branch 'tor-github/pr/704' into maint-0.4.0
2019-02-19 11:51:19 -05:00
Nick Mathewson
f70929347f
Merge branch 'maint-0.4.0'
2019-02-19 11:49:24 -05:00
Nick Mathewson
4bc55ed5ee
Merge branch 'bug29145_029' into maint-0.4.0
2019-02-19 11:49:20 -05:00
Kris Katterjohn
4417ac880a
Fix a compiler warning on OpenBSD
...
malloc_options needs to be declared extern (and declaring it extern
means we need to initialize it separately)
Fixes bug 29145; bugfix on 0.2.9.3-alpha
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
2019-02-19 11:38:32 -05:00
Nick Mathewson
af36af1a9b
Merge remote-tracking branch 'tor-github/pr/683'
2019-02-19 11:32:33 -05:00
Nick Mathewson
1239e411a7
Merge remote-tracking branch 'tor-github/pr/694'
2019-02-19 11:31:22 -05:00
Nick Mathewson
0db0b4769c
Merge remote-tracking branch 'tor-github/pr/678'
2019-02-19 11:30:27 -05:00
Nick Mathewson
26873bc4ed
Merge branch 'bug28698_035' into maint-0.4.0
2019-02-19 11:27:18 -05:00
José M. Guisado
78220aae1e
Add circuit time check before logging about relaxing circuit time
...
Signed-off-by: José M. Guisado <guigom@riseup.net>
2019-02-19 11:24:51 -05:00
Nick Mathewson
5c87add923
Merge remote-tracking branch 'tor-github/pr/701' into maint-0.4.0
2019-02-19 11:21:51 -05:00
teor
a798bd40fb
stats: Stop reporting statistics when ExtraInfoStatistics is 0
...
When ExtraInfoStatistics is 0, stop including bandwidth usage statistics,
GeoIPFile hashes, ServerTransportPlugin lines, and bridge statistics
by country in extra-info documents.
Fixes bug 29018; bugfix on 0.2.4.1-alpha (and earlier versions).
2019-02-19 19:01:44 +10:00
teor
361738c964
Merge branch 'bug29017-033' into bug29017-master-merge
2019-02-19 18:59:16 +10:00
rl1987
6fdd34acd6
Remove check-tor script
2019-02-15 19:18:24 +02:00
George Kadianakis
80abe4170d
Update all the histogram functions to use the new design.
2019-02-15 17:43:23 +02:00
Matt Traudt
b054a6c6b9
kist: When readding chans, check correct chan's sched_heap_idx
...
Closes #29508
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-02-14 16:19:31 -05:00
George Kadianakis
00b073b1bc
Merge branch 'maint-0.3.5'
2019-02-14 18:01:07 +02:00
George Kadianakis
d83c299eba
Merge branch 'tor-github/pr/689' into maint-0.3.5
2019-02-14 18:00:05 +02:00
George Kadianakis
9bfe4ed6dd
Merge branch 'tor-github/pr/536' into maint-0.3.5
2019-02-14 17:39:34 +02:00
George Kadianakis
f5a6d4c6ea
Disable unstable circuit padding unittest.
...
until #29298 is implemented.
2019-02-14 12:09:41 +02:00
Nick Mathewson
5f42bc0f48
Merge remote-tracking branch 'tor-github/pr/699'
2019-02-13 15:19:59 -05:00
Nick Mathewson
5687165cf1
Merge remote-tracking branch 'tor-github/pr/674'
2019-02-13 11:38:35 -05:00
David Goulet
d5de1a0a55
Merge branch 'tor-github/pr/651'
2019-02-13 11:02:02 -05:00
David Goulet
6efc2a0e1f
Merge branch 'tor-github/pr/650' into maint-0.3.5
2019-02-13 10:56:24 -05:00
juga0
b61c3c6dfa
changes: Add changes file for #26698
2019-02-13 12:26:00 +00:00
David Goulet
c320c52e89
Merge branch 'tor-github/pr/690'
2019-02-12 13:04:25 -05:00
David Goulet
95e5f8fe03
Merge branch 'tor-github/pr/671'
2019-02-12 13:02:30 -05:00
Nick Mathewson
72b978c3a5
On windows, if we fail to load a consensus and it has a CRLF, retry.
...
Fixes bug 28614; bugfix on 0.4.0.1-alpha when we started mmapping
the consensus.
2019-02-12 12:57:33 -05:00
Nick Mathewson
a797a69679
Merge branch 'maint-0.3.5'
2019-02-12 09:56:50 -05:00
Nick Mathewson
db209d4dba
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-12 09:56:49 -05:00
Nick Mathewson
7ead2af622
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-02-12 09:56:49 -05:00
Nick Mathewson
2e770216c4
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-12 09:56:49 -05:00
Karsten Loesing
a3f9ddcf03
Update geoip and geoip6 to the February 5 2019 database.
2019-02-12 14:40:42 +01:00
rl1987
8d04dc416b
Add changes file
2019-02-09 16:56:54 +02:00
Nick Mathewson
f4c76661d1
Add a script to check for coverage nondeterminism
...
Closes ticket 29436.
2019-02-08 11:22:24 -05:00
Nick Mathewson
f2b646a2b6
Merge branch 'ticket29435_035' into ticket29435_040
2019-02-08 10:47:04 -05:00
Nick Mathewson
192b312c97
Fix coverage script.
...
It was looking for object files made with the old automake
directorations, but those changed when we split up our libraries.
Fixes bug 29435; bugfix on 0.3.5.1-alpha.
2019-02-08 10:43:38 -05:00
rl1987
b53fee4622
Fix SC2086 warning in test_workqueue_*.sh shell scripts
2019-02-08 16:51:49 +02:00
Nick Mathewson
b63404ebba
Changes file for ticket29026.
2019-02-08 08:52:46 -05:00
Nick Mathewson
7f59b9fb1f
Merge branch 'maint-0.3.5'
2019-02-08 08:37:46 -05:00
Nick Mathewson
ab65347819
Merge branch 'ticket29040_1_changes' into maint-0.3.5
2019-02-08 08:37:43 -05:00
Nick Mathewson
eca0f87801
Add changes file for bug 29040.
2019-02-08 08:37:23 -05:00
Nick Mathewson
b1ae2fd65b
Merge branch 'maint-0.3.5'
2019-02-08 08:19:34 -05:00
Nick Mathewson
4b36f9676d
Merge remote-tracking branch 'tor-github/pr/670' into maint-0.3.5
2019-02-08 08:19:31 -05:00
rl1987
8df6a65e6b
Fix shellcheck warning in zero_length_keys.sh
2019-02-07 17:23:23 +02:00
rl1987
daff9e1ba1
Fix shellcheck warning in fuzz_static_testcases.sh
2019-02-06 11:01:22 +02:00
rl1987
4e3880607a
Add changes file
2019-02-06 10:53:12 +02:00
Roger Dingledine
bfd1d70243
Merge branch 'maint-0.3.5'
2019-02-05 08:10:43 -05:00
Roger Dingledine
bca25eebfb
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-05 08:10:14 -05:00
Roger Dingledine
8ea98c0f4c
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-05 08:09:47 -05:00
Peter Gerber
83b1ca9b07
Add release note for bug 29150
2019-02-02 23:10:16 +00:00
rl1987
583e20615c
Add changes file
2019-02-02 16:54:50 +02:00
rl1987
0b245e418e
Add changes file
2019-02-01 21:43:45 +02:00
rl1987
10455aeff2
Fix shellcheck warnings in test_rust.sh
2019-02-01 20:53:40 +02:00
Nick Mathewson
4d7a0a1310
Update Cargo.lock with new comment; suppress 29244.
2019-02-01 16:38:23 +01:00
José M. Guisado
cb1072790f
Warn about missing ContactInfo when MyFamily set
...
Operators should be warned when setting MyFamily in
addition to missing ContactInfo
Signed-off-by: José M. Guisado <guigom@riseup.net>
2019-01-31 13:27:42 +01:00
teor
6170d3fcf1
hs: Onion services put IPv6 addresses in service descriptors
...
Rewrite service_intro_point_new() to take a node_t. Since
node_get_link_specifier_smartlist() supports IPv6 link specifiers,
this refactor adds IPv6 addresses to onion service descriptors.
Part of 23576, implements 26992.
2019-01-31 07:53:22 +01:00
rl1987
58cbe51708
Use RFC5737-compliant example IP addresses in manpage when describing MapAddress
2019-01-30 17:13:40 +02:00
Nick Mathewson
bbd893d6bd
Write consensus files in binary mode
...
This will help us out on windows now that we mmap files. Fixes part
of ticket 28614.
2019-01-29 16:18:41 +01:00
rl1987
790150e57a
Allow empty username/password in SOCKS5 username/password auth message
2019-01-26 11:06:33 +02:00
Nick Mathewson
e19222a0da
Use tt_u64_op() in test_circuitpadding.c to fix compilation warnings
...
Fixes bug 29169.
2019-01-24 13:20:21 -05:00
Nick Mathewson
8b254c1c70
Merge branch 'precommit_squashed'
2019-01-24 11:08:10 -05:00
Neel Chauhan
c985940de9
Add version 3 onion service support to HSFETCH
2019-01-24 10:22:41 -05:00
rl1987
99fffc6c2f
Add a pre-commit hook that runs code and changelog entry formatting checks
2019-01-24 08:03:17 -05:00
Nick Mathewson
d23704bf26
Merge branch 'ticket28668_035' into ticket28668_040
2019-01-23 14:50:22 -05:00
Nick Mathewson
6144cf99ad
Capture more BUG warnings in util/time test
...
These are ones that happen on windows only.
Fixes bug 29161.
2019-01-23 12:37:12 -05:00
Nick Mathewson
54c9c8b04f
If address/get_if_addrs6 can't findipv6, log WARN, not ERR
...
Fixes 29160, and allows 28668 (treating ERR logs as test failures)
to procede.
2019-01-23 12:04:57 -05:00
Nick Mathewson
adeeb8841e
Merge branch 'maint-0.3.5'
2019-01-23 11:18:14 -05:00
rl1987
712a622fce
Log an HSDesc we failed to parse at Debug loglevel
2019-01-23 10:37:10 -05:00
Nick Mathewson
dd6c2b0ad7
maint-0.2.9: remove changes files that are merged in 0.2.9 releases
...
Many of these files cause check-changes to fail, which will be a
long-term problem as we continue to support 0.2.9.
2019-01-23 09:48:28 -05:00
Nick Mathewson
8e1e71cc0d
Merge branch 'bug29122'
2019-01-22 14:31:01 -05:00
George Kadianakis
6243133a71
Fix intermittent failures of test_circuitpadding_wronghop().
...
We fix it by disabling the scheduling of actual padding.
Fixes #29122 .
2019-01-22 14:30:43 -05:00
Nick Mathewson
74e41155ff
Merge branch 'maint-0.3.5'
2019-01-22 12:27:50 -05:00
Nick Mathewson
d9fde87607
correct bug number in 29042 changelog
2019-01-22 12:27:46 -05:00
Nick Mathewson
21dd3ece62
Merge branch 'maint-0.3.5'
2019-01-22 11:55:56 -05:00
Nick Mathewson
4159d103d6
Merge branch 'bug29042_035' into maint-0.3.5
2019-01-22 11:55:53 -05:00
rl1987
00fff96e48
Fix shellcheck warning in test_rebind.sh
2019-01-22 15:14:16 +02:00
Nick Mathewson
00bc18b847
Merge remote-tracking branch 'tor-github/pr/653'
2019-01-22 08:13:14 -05:00
Nick Mathewson
0ce4d23af5
Merge branch 'maint-0.3.5'
2019-01-22 08:04:55 -05:00
Nick Mathewson
9ce1978b5e
Merge branch 'bug28979_035' into maint-0.3.5
2019-01-22 08:04:52 -05:00
rl1987
2529b29a75
Fix shellcheck warning SC2145 in torify script
2019-01-19 17:39:48 +02:00
Nick Mathewson
d1af4d65df
Merge branch 'maint-0.3.5'
2019-01-18 12:25:08 -05:00
Nick Mathewson
761f1bf71e
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-18 12:25:08 -05:00
Nick Mathewson
4cca7fb99b
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-01-18 12:25:08 -05:00
Nick Mathewson
a8580a6836
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-18 12:25:08 -05:00
rl1987
88818eacbd
Cleanup shellcheck warnings in autogen.sh
2019-01-18 13:49:30 +02:00
Nick Mathewson
d3b122485e
Add a changes file for 28837 (OpenSSL sha3)
2019-01-17 12:43:20 -05:00
Nick Mathewson
7c6a8c674b
Fix documentation for ClientAuth on HSv3.
...
The manpage erroneously said "privkey" when "public-key" would have
been correct. Reported by "Felixix" as ticket 28979. Bugfix on
0.3.5.1-alpha.
2019-01-16 16:10:20 -05:00
Nick Mathewson
3baf99e81b
Merge branch 'ticket28668_035' into ticket28668_040
2019-01-16 15:54:31 -05:00
Nick Mathewson
f684cd8005
Fail any unit test that causes an unhandled LD_BUG or LOG_ERR
...
Closes ticket 28668.
2019-01-16 15:47:33 -05:00
Nick Mathewson
16430fdaf5
Merge branch 'maint-0.3.5'
2019-01-16 14:43:53 -05:00
Kris Katterjohn
f0408b844f
Add changes file for bug 28981
...
The fix was in commit 61636ad989de674698601284957dacde53cc4984.
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
2019-01-16 14:40:31 -05:00
Nick Mathewson
0981ac4c59
Log more messages when failing to decode RSA keys
...
We log these messages at INFO level, except when we are reading a
private key from a file, in which case we log at WARN.
This fixes a regression from when we re-wrote our PEM code to be
generic between nss and openssl.
Fixes bug 29042, bugfix on 0.3.5.1-alpha.
2019-01-16 14:35:30 -05:00
Nick Mathewson
49062d72b5
Start on 0.4.0.1-alpha changelog
2019-01-16 08:28:07 -05:00
Nick Mathewson
139202174b
Remove changes entries that appeared in 0.3.5.7
2019-01-16 08:20:12 -05:00
Nick Mathewson
2dd23086f1
Remove fallback scripts and whitelist
...
They have been extracted to a new fallback-scripts.git repository.
Closes ticket 27914.
2019-01-15 19:20:25 -05:00
Mike Perry
6440fdb8de
Changes file for Ticket 28142.
2019-01-15 22:53:03 +00:00
Nick Mathewson
9a61d3f5ad
Merge branch 'bug24953_squashed'
2019-01-15 08:25:35 -05:00
rl1987
7fbe7a2563
In updateFallbackDirs.py, say 'fallback list' instead of 'whitelist'
2019-01-15 08:25:29 -05:00
Nick Mathewson
c281e587bb
Merge branch 'ticket28058_squashed'
2019-01-15 08:08:41 -05:00
rl1987
30a925fe96
Add changes file
2019-01-15 08:08:29 -05:00
Nick Mathewson
691dec5d46
Merge branch 'maint-0.3.5'
2019-01-14 14:02:42 -05:00
rl1987
9d9e71824c
Rework rep_hist_log_link_protocol_counts()
2019-01-14 14:01:55 -05:00
Nick Mathewson
cef910642e
Merge branch 'bug28989_squashed'
2019-01-11 18:56:57 -05:00
rl1987
1bcececdd8
Fix CID 1442277
2019-01-11 18:56:48 -05:00
Nick Mathewson
d21fa48cac
Merge branch 'maint-0.3.5'
2019-01-11 18:53:24 -05:00
Nick Mathewson
efd765a948
Merge remote-tracking branch 'tor-github/pr/563' into maint-0.3.5
2019-01-11 18:53:18 -05:00
teor
89a0b77740
rend: stop warning when clients send multiple rend establish cells
...
Stop logging "Tried to establish rendezvous on non-OR circuit..." as
a warning. Instead, log it as a protocol warning, because there is
nothing that relay operators can do to fix it.
Fixes bug 29029; bugfix on 0.2.5.7-rc.
2019-01-10 07:59:59 +10:00
Nick Mathewson
2f0e187191
Merge remote-tracking branch 'tor-github/pr/627'
2019-01-09 15:46:14 -05:00
Nick Mathewson
578a93bbbc
Merge branch 'ticket28843'
2019-01-09 09:49:25 -05:00
Nick Mathewson
0ed966fde1
Merge branch 'maint-0.3.5'
2019-01-09 09:38:27 -05:00
Nick Mathewson
694e3c57fd
Merge remote-tracking branch 'tor-github/pr/636' into maint-0.3.5
2019-01-09 09:38:22 -05:00
Nick Mathewson
d890ec29aa
Merge branch 'maint-0.3.5'
2019-01-09 09:35:40 -05:00
rl1987
380ae2b74b
Stop logging 'Your Guard' in circpathbias.c
2019-01-09 09:35:36 -05:00
Nick Mathewson
3df1d29d9b
Merge branch 'bug28591_035_squashed'
2019-01-09 09:33:31 -05:00
teor
44db455cc8
Dir: allow directory mirrors to serve future consensuses
...
When Tor's clock is behind the clocks on the authorities, allow Tor to
serve future consensuses.
Fixes bug 28654; bugfix on 0.3.0.1-alpha.
2019-01-09 09:32:28 -05:00
Nick Mathewson
e6a4401200
Merge branch 'maint-0.3.5'
2019-01-09 08:52:10 -05:00
Kris Katterjohn
09472791d0
Add changes file for bug 28938
...
The fix was in commit 30b84adb5f0b6e56d0fb82c374e3cb44089f64d0.
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
2019-01-09 08:52:05 -05:00
Nick Mathewson
a891d81c5f
Changes file for 28856
2019-01-09 08:48:11 -05:00
teor
85c598cbc2
stats: Make PaddingStatistics depend on ExtraInfoStatistics
...
When ExtraInfoStatistics is 0, stop including PaddingStatistics in
relay and bridge extra-info documents.
Fixes bug 29017; bugfix on 0.3.1.1-alpha.
2019-01-08 18:21:10 +10:00
Kris Katterjohn
c59b572e93
Fix tor_ersatz_socketpair on IPv6-only systems
...
In get_local_listener used by tor_ersatz_socketpair, the address
family used when binding the IPv6 socket was AF_INET instead of
AF_INET6.
Fixes bug 28995; bugfix on 0.3.5.1-alpha.
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
2019-01-07 17:28:21 -06:00
Nick Mathewson
0402746a99
Merge remote-tracking branch 'rl1987/doc28805'
2019-01-07 08:51:37 -05:00
Nick Mathewson
85c5f58509
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-07 08:43:46 -05:00
Nick Mathewson
fe26e1f1c8
Merge branch 'maint-0.3.5'
2019-01-07 08:43:46 -05:00
Nick Mathewson
3d18903f53
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-07 08:43:45 -05:00
Nick Mathewson
ba71b17865
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-01-07 08:43:45 -05:00
Karsten Loesing
445d6750f7
Update geoip and geoip6 to the January 3 2019 database.
2019-01-07 09:00:29 +01:00
Nick Mathewson
73de7b4bcb
Merge branch 'bug21394_029_redux' into maint-0.2.9
2019-01-04 15:04:54 -05:00
Nick Mathewson
af85a0f28f
Remove from master those changes files that will appear in 0.3.5.7 or earlier.
2019-01-04 15:04:00 -05:00
Nick Mathewson
fe3331b845
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-04 14:57:06 -05:00
Nick Mathewson
bf8bb9c526
Merge remote-tracking branch 'dgoulet/ticket28619_033_01' into maint-0.3.3
2019-01-04 14:49:16 -05:00
Nick Mathewson
d47c9276de
Merge branch 'ticket27750_034_01_squashed' into maint-0.3.4
2019-01-04 14:34:38 -05:00
Nick Mathewson
98a1b8770c
Merge branch 'maint-0.3.5'
2019-01-03 21:34:43 -05:00
Nick Mathewson
c75cf802d3
Merge branch 'ticket28879' into maint-0.3.5
2019-01-03 21:34:35 -05:00
Nick Mathewson
a7cbbf279e
Merge branch 'ticket28852'
2019-01-03 21:31:08 -05:00
Nick Mathewson
9ba690e33f
Merge branch 'maint-0.3.5'
2019-01-03 09:45:56 -05:00
Nick Mathewson
abdc6aede2
Merge branch 'ticket28851_035_squashed' into maint-0.3.5
2019-01-03 09:45:53 -05:00
Nick Mathewson
b82717b273
Stop re-checking our hardcoded dh parameters on every startup
...
Closes ticket 28851.
2019-01-03 09:45:43 -05:00
Nick Mathewson
47176eb678
Merge branch 'maint-0.3.5'
2019-01-03 09:44:15 -05:00
Nick Mathewson
98736cf36a
Merge remote-tracking branch 'public/ticket28838_035' into maint-0.3.5
2019-01-03 09:44:10 -05:00
Nick Mathewson
27853938a1
Merge branch 'maint-0.3.5'
2019-01-03 09:02:40 -05:00
Nick Mathewson
3e64553f76
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-03 09:02:39 -05:00
Nick Mathewson
ed62f0fa15
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-03 09:02:39 -05:00
Nick Mathewson
bf413829cb
Detect openssl bug 7712 and work around it.
...
In theory it would be better to detect this bug in advance, but this
approach is much simpler, and therefore safer to backport.
This closes tor issue 28973.
2019-01-03 09:00:47 -05:00
rl1987
dbf1725a13
Completely remove 'GETINFO status/version/num-{concurring,versioning}'
2019-01-03 10:36:38 +02:00
Nick Mathewson
3e7f13a4ef
Merge branch 'maint-0.3.5'
2019-01-02 16:15:39 -05:00
Nick Mathewson
98755cbddf
Merge branch 'bug28974_035' into maint-0.3.5
2019-01-02 16:15:34 -05:00
Nick Mathewson
eaaeaf7933
Merge branch 'maint-0.3.5'
2019-01-02 16:09:20 -05:00
Nick Mathewson
a4b86421d2
ticket 28924 deserves a changes file. I made one, but I guess I forgot to git add
2019-01-02 16:09:10 -05:00
Nick Mathewson
b33bcb1e63
Add an errno.h include to freespace.c to fix bug 28974.
2019-01-02 15:19:52 -05:00
rl1987
8eadfad71d
Tweak ControlPort description in manpage
2018-12-23 19:58:25 +02:00
Nick Mathewson
99713b176b
Merge branch 'maint-0.3.5'
2018-12-21 15:42:58 -05:00
Nick Mathewson
a9eec33649
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-12-21 15:42:57 -05:00
Nick Mathewson
70dd6d07bb
Merge branch 'orconn-tracker_squashed'
2018-12-21 14:22:11 -05:00
Taylor Yu
2100b35f07
changes file for ticket27167
2018-12-21 14:15:35 -05:00
Nick Mathewson
ab4395d082
Merge branch 'ticket28847'
2018-12-21 13:26:47 -05:00
Alexander Færøy
cf4b3dbd44
Use the subsystem list to initialize and shutdown process module.
...
This patch makes the process module use the subsystem list for
initializing and shutting down.
See: https://bugs.torproject.org/28847
2018-12-21 13:26:38 -05:00
David Goulet
2420e84ba4
mainloop: Reactivate the linked connection event with a non empty list
...
Linked connections aren't woken up by libevent due to I/O but rather
artificially so we can, by chunks, empty the spooled object(s).
Commit 5719dfb48f
(in 0.3.4.1-alpha) made it
that the schedule_active_linked_connections_event would be only called once at
startup but this is wrong because then we would never go through again the
active linked connections.
Fortunately, everytime a new linked connection is created, the event is
activated and thus we would go through the active list again. On a busy relay,
this issue is mitigated by that but on a slower relays or bridge, a connection
could get stuck for a while until a new directory information request would
show up.
Fixes #28717 , #28912
2018-12-21 11:25:23 -05:00
Nick Mathewson
e4109020e9
Merge remote-tracking branch 'tor-github/pr/609'
2018-12-20 16:42:35 -05:00
Nick Mathewson
0e6e902cbc
Merge branch 'document_--version'
2018-12-20 11:50:48 -05:00
Nick Mathewson
a517daa56f
base32_decode(): Return number of bytes written on success.
...
This makes it consistent with base64_decode().
Closes ticket 28913.
2018-12-20 08:36:25 -05:00
Nick Mathewson
973a5db808
Merge remote-tracking branch 'tor-github/pr/445'
2018-12-20 07:53:57 -05:00
Nick Mathewson
9c6283732a
Merge branch 'maint-0.3.5'
2018-12-20 07:50:04 -05:00
Nick Mathewson
ef97543270
Merge remote-tracking branch 'tor-github/pr/607' into maint-0.3.5
2018-12-20 07:49:59 -05:00
Alexander Færøy
e2c36b9ca0
Add and update changes files for #28846 .
...
This ticket finishes the implementatoin of #28180 and adds the new
STATUS message from #28846 .
See: https://bugs.torproject.org/28846
2018-12-20 04:08:04 +01:00
teor
02009c66c0
Stop running stem's unit tests as part of "make test-stem"
...
But continue to run stem's unit and online tests during
"make test-stem-full".
Fixes bug 28568; bugfix on 0.2.6.3-alpha.
2018-12-20 13:01:18 +10:00
Nick Mathewson
1c47459e5a
Merge branch 'maint-0.3.5'
2018-12-19 15:36:08 -05:00
Nick Mathewson
b7018b1a24
Merge branch 'ticket28883_035' into maint-0.3.5
2018-12-19 15:36:03 -05:00
Nick Mathewson
ed0bc85ed0
Merge branch 'ticket28853'
2018-12-18 18:59:56 -05:00
Nick Mathewson
bb091da1e7
Merge branch 'ticket28839_v2_squashed'
2018-12-18 18:59:05 -05:00
Nick Mathewson
976c62e62a
Changes file for ticket28839
2018-12-18 18:58:08 -05:00
Nick Mathewson
372df7a630
Merge branch 'maint-0.3.5'
2018-12-18 13:56:22 -05:00
Nick Mathewson
26bbeb298d
Merge branch 'bug28612_squashed' into maint-0.3.5
2018-12-18 13:55:57 -05:00
Nick Mathewson
1c2abea30a
Call run_tor_main_loop() in ntmain.c, rather than do_main_loop().
...
Fixes bug 28612; bugfix on 0.3.5.3-alpha.
2018-12-18 13:55:08 -05:00
Nick Mathewson
0af0f78dff
Merge branch 'maint-0.3.5'
2018-12-18 13:52:39 -05:00
Nick Mathewson
702fd6f0f2
Merge branch 'ticket28881_035' into maint-0.3.5
2018-12-18 13:52:36 -05:00
Nick Mathewson
4894d44ab8
Always initialize addr in parse_port_config()
...
It was always analyzed before use, but scan-build wasn't able to
persuade itself of that.
Closes ticket 28881.
2018-12-18 13:52:25 -05:00
Nick Mathewson
a3e6f2467b
Merge remote-tracking branch 'tor-github/pr/595'
2018-12-18 13:51:21 -05:00
Nick Mathewson
872998dd00
Merge branch 'ticket28179_squashed_merged'
2018-12-18 13:36:34 -05:00
Alexander Færøy
44a80bb361
Add missing changes files for #26360 , #28179 , #28180 .
...
See: https://bugs.torproject.org/26179
See: https://bugs.torproject.org/28180
See: https://bugs.torproject.org/28360
2018-12-18 13:36:08 -05:00
Nick Mathewson
90187b1bfc
Remove changes that are already merged in 0.3.5.x releases
2018-12-18 08:15:38 -05:00
Nick Mathewson
c61cd5775c
Revert "Log bootstrap tag names"
...
This reverts commit 1b855af5e3
.
2018-12-18 08:09:43 -05:00
Nick Mathewson
508837b62b
Document the output of --version
...
Closes 28889
2018-12-17 17:54:01 -05:00
Nick Mathewson
5a22b42c3a
Merge branch 'maint-0.3.5'
2018-12-17 10:57:51 -05:00
Nick Mathewson
1a9a9fc0ff
Changes file for 28562
2018-12-17 10:57:47 -05:00
Nick Mathewson
315c21d2e2
test_rebind: wait for tor to timeout, even if it is logging a lot
...
Fixes bug 28883; bugfix on 0.3.5.4-alpha.
2018-12-17 09:53:17 -05:00
Nick Mathewson
16199a54a2
Check hostname before using it in send_resolved_hostname_cell()
...
Also, turn an absent hostname into a BUG(), not a crash.
Found by scan-build.
Closes ticket 28879; bugfix on 0.1.2.7-alpha
2018-12-17 09:15:37 -05:00
Nick Mathewson
3dd1f064a7
Rewrite the core of parse_short_policy() to be faster.
...
The old implementation did some funky out-of-order lexing, and
tended to parse every port twice if the %d-%d pattern didn't match.
Closes ticket 28853.
2018-12-14 16:07:10 -05:00
Nick Mathewson
9dc53bc68f
Remove a needless memset() in get_token_arguments()
...
I believe we originally added this for "just in case" safety, but it
isn't actually needed -- we never copy uninitialized stack here.
What's more, this one memset is showing up on our startup profiles,
so we ought to remove it.
Closes ticket 28852.
2018-12-14 14:48:12 -05:00
Matt Traudt
06046c726f
Add changes file for <30min HeartbeatPeriod patch
2018-12-14 09:24:19 -05:00
Nick Mathewson
4bc3983f64
Add a DROPOWNERSHIP controller command to undo TAKEOWNERSHIP.
...
Closes ticket 28843.
2018-12-13 19:35:02 -05:00
Nick Mathewson
f8dac5c900
Merge branch 'maint-0.3.5'
2018-12-13 19:01:29 -05:00
Nick Mathewson
94a7998158
Merge remote-tracking branch 'tlyu-github/ticket28731-035' into maint-0.3.5
2018-12-13 18:57:00 -05:00
Nick Mathewson
041e9235c1
Lower the loop_max constant in curve25519_basepoint_spot_check()
...
The point of this function is to make sure that the ed25519-based
implementation of curve25519_basepoint() actually works when we
start tor, and use the regular fallback implementation if it
doesn't. But it accounts for 9% of our startup time in the case
when we have directory information, and I think it's safe to make
the test shorter. After all, it has yet to find any actual bugs in
curved25519_scalarmult_basepoint_donna() on any platforms.
Closes ticket 28838.
2018-12-13 11:26:09 -05:00
Nick Mathewson
69264f96f3
Merge branch 'dormant_persist_squashed'
2018-12-13 08:26:10 -05:00
Nick Mathewson
c037bf5817
changes file for ticket26864
2018-12-13 08:25:54 -05:00
Nick Mathewson
91be6a77e9
Merge remote-tracking branch 'teor/ticket24838'
2018-12-11 10:04:16 -05:00
Nick Mathewson
93019b4787
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-12-11 10:00:22 -05:00
Nick Mathewson
633813e313
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-12-11 10:00:22 -05:00
Nick Mathewson
b2625b09f1
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-12-11 10:00:22 -05:00
Nick Mathewson
1983426073
Merge branch 'maint-0.3.5'
2018-12-11 10:00:22 -05:00
Nick Mathewson
3b5188576f
Note ticket number in changes file for 24803
2018-12-11 10:00:19 -05:00
Nick Mathewson
b915b6cd21
Merge remote-tracking branch 'github/prop297'
2018-12-11 09:44:57 -05:00
Nick Mathewson
6506b1ee9f
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-12-11 09:41:05 -05:00
Nick Mathewson
e1273d7d1b
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-12-11 09:41:05 -05:00
Nick Mathewson
27e4269929
Merge branch 'maint-0.3.5'
2018-12-11 09:41:05 -05:00
Nick Mathewson
c1f9191581
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-12-11 09:41:04 -05:00
Nick Mathewson
58d2ced572
Merge remote-tracking branch 'teor/24805-phoul'
2018-12-11 09:38:27 -05:00
Nick Mathewson
ce501a529f
Merge remote-tracking branch 'catalyst-github/ticket27402'
2018-12-11 09:37:41 -05:00
Nick Mathewson
b65166750d
Merge remote-tracking branch 'rl1987/ticket28007_take2'
2018-12-11 09:25:46 -05:00
Nick Mathewson
c4c372f281
Merge remote-tracking branch 'rl1987/ticket28551'
2018-12-11 09:24:35 -05:00
Taylor Yu
1b855af5e3
Log bootstrap tag names
...
Add the bootstrap tag name to the log messages, so people
troubleshooting connection problems can look up a symbol instead of a
number. Closes ticket 28731.
2018-12-10 17:22:28 -06:00
teor
4991b29311
Fallbacks: Update the hard-coded fallback list in December 2018
...
Merge Phoul's two lists into teor's list.
Replace the 150 fallbacks originally introduced in Tor 0.3.3.1-alpha in
January 2018 (of which ~115 were still functional), with a list of
157 fallbacks (92 new, 65 existing, 85 removed) generated in
December 2018.
Closes ticket 24803.
2018-12-10 17:02:19 +10:00
teor
d9b9c1fa76
Changes file for 24805
2018-12-07 17:04:50 +10:00
teor
78e177d622
Fallbacks: Update the hard-coded fallback list in December 2018
...
Replace the 150 fallbacks originally introduced in Tor 0.3.3.1-alpha in
January 2018 (of which ~115 were still functional), with a list of
148 fallbacks (89 new, 59 existing, 91 removed) generated in
December 2018.
Closes ticket 24803.
2018-12-07 16:43:10 +10:00
teor
6bc5c06dc2
Fallbacks: accept relays that are a fuzzy match to the whitelist
...
If a relay matches at least one fingerprint, IPv4 address, or IPv6
address in the fallback whitelist, it can become a fallback. This
reduces the work required to keep the list up to date.
Closes ticket 28768.
2018-12-07 16:30:24 +10:00
teor
c3fe405e21
Fallbacks: use a 24 hour future consensus tolerance
...
Tor clients on 0.3.5.6-rc? and later will use a consensus that will become
valid up to 24 hours in the future.
Clients on 0.3.5.5-alpha? and earlier won't accept future consensuses.
Update the fallback expiry tolerance to match tor's checks.
Part of 28768, follow-up on 28591.
2018-12-07 15:54:32 +10:00
teor
766fd6cf76
Fallbacks: use a 24 hour consensus expiry tolerance
...
Tor clients will use a consensus that expired up to 24 hours ago.
Clients on 0.3.5.5-alpha? and earlier won't select guards from an expired
consensus, but they can still bootstrap if they have existing guards.
Update the fallback expiry tolerance to match tor's checks.
Part of 28768, follow-up on 24661.
2018-12-07 15:54:32 +10:00
Nick Mathewson
2ccb9e9444
Merge branch 'maint-0.3.5'
2018-12-06 09:26:34 -05:00
Nick Mathewson
c1f86f7492
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-12-06 09:26:33 -05:00
Nick Mathewson
c4f7953d8b
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-12-06 09:26:32 -05:00
Nick Mathewson
00341d97f3
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-12-06 09:26:32 -05:00
rl1987
ecaecaddd8
Add changes file
2018-12-06 15:31:33 +02:00
Karsten Loesing
57798eb1cb
Update geoip and geoip6 to the December 5 2018 database.
2018-12-05 21:02:39 +01:00
Nick Mathewson
46a321fbdd
Merge branch 'maint-0.3.5'
2018-12-05 10:25:12 -05:00
Nick Mathewson
967efc0d28
Merge remote-tracking branch 'tor-github/pr/546' into maint-0.3.5
2018-12-05 10:23:28 -05:00
Nick Mathewson
1eb3719a62
Merge remote-tracking branch 'public/prop298'
2018-12-05 09:43:03 -05:00
Nick Mathewson
1f95e80351
Merge branch 'prop293_squashed'
2018-12-05 09:24:51 -05:00
Nick Mathewson
d4f558e385
Merge remote-tracking branch 'tor-github/pr/531'
2018-12-05 09:02:49 -05:00
Nick Mathewson
4002a84ffe
Merge remote-tracking branch 'tor-github/pr/561'
2018-12-05 08:29:41 -05:00
Nick Mathewson
ca4b86f90a
Merge remote-tracking branch 'tor-github/pr/508'
2018-12-05 08:19:02 -05:00
David Goulet
cec616a0c8
hs-v3: Don't BUG() if descriptor is found on SOCKS connection retry
...
When retrying all SOCKS connection because new directory information just
arrived, do not BUG() if a connection in state AP_CONN_STATE_RENDDESC_WAIT is
found to have a usable descriptor.
There is a rare case when this can happen as detailed in #28669 so the right
thing to do is put that connection back in circuit wait state so the
descriptor can be retried.
Fixes #28669
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-12-04 14:34:04 -05:00
David Goulet
8506dcdeb7
Merge branch 'maint-0.3.5'
2018-12-04 12:55:02 -05:00
David Goulet
0906dde9d5
man: Document HSv3 client authorization revocation
...
Removing a ".auth" file revokes a client access to the service but the
rendezvous circuit is not closed service side because the service simply
doesn't know which circuit is for which client.
This commit notes in the man page that to fully revoke a client access to the
service, the tor process should be restarted.
Closes #28275
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-12-04 18:49:19 +02:00