torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
29,367 Commits 53 Branches 631 Tags
274ef2637fc09444212147bcd625c6a16eae0765
Commit Graph

29367 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 274ef2637f Merge branch 'maint-0.3.4' into release-0.3.4 2018-10-23 19:54:16 -04:00
Nick Mathewson fd6078b33a Merge branch 'maint-0.3.3' into maint-0.3.4 2018-10-23 19:50:53 -04:00
Nick Mathewson b2c52f5d6d Remove a now-unused rust "use". 2018-10-23 19:50:45 -04:00
Nick Mathewson 271144c99e Merge branch 'maint-0.3.4' into release-0.3.4 2018-10-23 19:18:23 -04:00
Nick Mathewson 7edc594ee7 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-10-23 19:18:23 -04:00
Nick Mathewson 169bc670dd Merge remote-tracking branch 'onionk/rust-allsupportednull1' into maint-0.3.3 2018-10-23 19:17:48 -04:00
Nick Mathewson 64f3637373 Merge branch 'maint-0.3.4' into release-0.3.4 2018-10-18 09:12:58 -04:00
Nick Mathewson d1eac7830f Merge branch 'maint-0.3.3' into maint-0.3.4 2018-10-18 09:12:58 -04:00
Taylor Yu 93fd924bdb Log more info for duplicate ed25519 IDs 
Occasionally, key pinning doesn't catch a relay that shares an ed25519
ID with another relay.  Log the identity fingerprints and the shared
ed25519 ID when this happens, instead of making a BUG() warning.

Fixes bug 27800; bugfix on 0.3.2.1-alpha.
 2018-10-17 15:39:55 -05:00
Nick Mathewson 8400bccb16 Merge branch 'maint-0.3.4' into release-0.3.4 2018-10-17 13:02:23 -04:00
David Goulet 2000d04cb6 conn: Stop writing when our write bandwidth limist is exhausted 
Commit 488e2b00bf introduced an issue, most
likely introduced by a bad copy paste, that made us stop reading on the
connection if our write bandwidth limit was reached.

The problem is that because "read_blocked_on_bw" was never set, the connection
was never reenabled for reading.

This is most likely the cause of #27813 where bytes were accumulating in the
kernel TCP bufers because tor was not doing reads. Only relays with
RelayBandwidthRate would suffer from this but affecting all relays connecting
to them. And using that tor option is recommended and best practice so many
many relays have it enabled.

Fixes #28089.
 2018-10-17 12:25:12 -04:00
Nick Mathewson f8aad4a548 Merge branch 'maint-0.3.4' into release-0.3.4 2018-10-16 18:05:58 -04:00
David Goulet b5731cdf2e mainloop: Set client role if ControlPort is set 
It turns out that if _only_ the ControlPort is set and nothing else, tor would
simply not bootstrap and thus not start properly. Commit 67a41b6306
removed that requirement for tor to be considered a "client".

Unfortunately, this made the mainloop enable basically nothing if only the
ControlPort is set in the torrc.

This commit now makes it that we also consider the ControlPort when deciding
if we are a Client or not. It does not revert 67a41b6306 meaning
options_any_client_port_set() stays the same, not looking at the control port.

Fixes #27849.

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2018-10-16 08:11:49 -04:00
Nick Mathewson bf1635d8cf Merge branch 'maint-0.3.4' into release-0.3.4 2018-10-16 08:04:34 -04:00
David Goulet 38599de2dd test: Update approx_time before the test starts 
This way we have the same time source when the IP is created and tested later.

Fixes #27810

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2018-10-16 08:03:55 -04:00
Nick Mathewson c8a7b7b585 Merge branch 'maint-0.3.4' into release-0.3.4 2018-10-15 12:52:54 -04:00
Nick Mathewson 633e99575f Merge branch 'maint-0.3.3' into maint-0.3.4 2018-10-15 12:52:54 -04:00
Nick Mathewson 6b2ef2c559 Fix another tor_assert(0) case 2018-10-15 12:52:48 -04:00
Nick Mathewson 35fbec3719 Merge branch 'maint-0.3.4' into release-0.3.4 2018-10-15 12:47:46 -04:00
Nick Mathewson d1ec7bb06e Merge branch 'maint-0.3.3' into maint-0.3.4 2018-10-15 12:47:46 -04:00
Nick Mathewson 86e0be421f Merge branch 'maint-0.2.9' into maint-0.3.3 2018-10-15 12:47:46 -04:00
Nick Mathewson 5b28190c67 Fix make check-spaces. 2018-10-15 12:47:19 -04:00
Nick Mathewson 7e9f1d6992 Merge branch 'maint-0.3.4' into release-0.3.4 2018-10-15 10:48:35 -04:00
Nick Mathewson 3462f8ed64 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-10-15 10:48:35 -04:00
Nick Mathewson 796e36e535 Adjust tor_assert_unreached() 
This version of the macro makes it obvious to the compiler that
"tor_assert_unreached()" will always abort().
 2018-10-15 10:46:26 -04:00
Nick Mathewson 294f5bb7e4 Merge branch 'maint-0.3.4' into release-0.3.4 2018-10-15 10:37:52 -04:00
Nick Mathewson fd528a0884 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-10-15 10:37:52 -04:00
Nick Mathewson dff7d3d00a Merge branch 'maint-0.2.9' into maint-0.3.3 2018-10-15 10:37:49 -04:00
Nick Mathewson b113399658 Merge branch 'bug27709_029' into maint-0.2.9 2018-10-15 10:34:39 -04:00
Nick Mathewson 5e582c7ffa Explain a bit more about branch prediction in the unit-test case 2018-10-15 10:16:34 -04:00
Nick Mathewson 0921904763 Merge branch 'maint-0.3.4' into release-0.3.4 2018-10-10 17:12:34 -04:00
Nick Mathewson ffaf180b7e Merge branch 'maint-0.3.3' into maint-0.3.4 2018-10-10 17:12:34 -04:00
Nick Mathewson f7e93cf2e7 Merge branch 'maint-0.2.9' into maint-0.3.3 2018-10-10 17:12:34 -04:00
Nick Mathewson 717507e3bb Merge remote-tracking branch 'tor-github/pr/392' into maint-0.2.9 2018-10-10 17:12:11 -04:00
Taylor Yu 484b259604 Merge branch 'bug27738-033' into bug27738-034 2018-10-10 15:13:02 -05:00
Taylor Yu cc10873dee Merge remote-tracking branch 'teor/bug27738-032' into bug27738-033 2018-10-10 15:01:59 -05:00
Nick Mathewson 70624a3be7 Merge branch 'maint-0.3.4' into release-0.3.4 2018-10-10 14:27:27 -04:00
Nick Mathewson 48182c147b Merge branch 'appveyor_pacman_fixes_034' into maint-0.3.4 2018-10-10 14:27:24 -04:00
Nick Mathewson 1310252326 Merge branch 'maint-0.3.4' into release-0.3.4 2018-10-10 11:34:49 -04:00
Nick Mathewson e5fe8b0e3a Merge branch 'maint-0.3.3' into maint-0.3.4 2018-10-10 11:34:49 -04:00
Nick Mathewson b057623bed Merge branch 'maint-0.2.9' into maint-0.3.3 2018-10-10 11:34:48 -04:00
Karsten Loesing 119df9c1c0 Update geoip and geoip6 to the October 9 2018 database. 2018-10-10 17:26:41 +02:00
Nick Mathewson c6b5b43d92 fixup! Changes file for apveyor changes 2018-10-10 11:10:29 -04:00
Nick Mathewson 8c0009a8de Changes file for apveyor changes 2018-10-10 10:22:08 -04:00
Nick Mathewson 1b57bbba02 Appveyor: Don't try to install the mingw openssl package 
This package conflicts with a preinstalled mingw openssl.

Fixes bug 27943. I think this was an appveyor change, not a Tor bug.
 2018-10-10 10:22:08 -04:00
Nick Mathewson c6d2990a73 Install only one of the two mingw architectures in appveyor 
Closes ticket 27765

This commit also changes the appveyor file to a unified line ending
style, since the old one was pretty confused.  Use "-b" to see the
real differences.
 2018-10-10 10:21:26 -04:00
Nick Mathewson 7001162b8e Merge branch 'maint-0.3.4' into release-0.3.4 2018-09-24 11:10:38 -04:00
Nick Mathewson f57d8722e0 Fix the 0.3.4 part of bug 27781 (arm compilation) 
Because with arm on OpenSSL <1.1 we don't define USE_EVP_AES_CTR, we
need to include crypto_util.h here.
 2018-09-24 11:08:27 -04:00
Nick Mathewson 08aaedb015 Merge branch 'maint-0.3.4' into release-0.3.4 2018-09-21 09:35:54 -04:00
Nick Mathewson e818a71905 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-09-21 09:35:54 -04:00