aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-11-15Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-11-15Merge branch 'bug26913_033' into maint-0.3.3Nick Mathewson
2018-11-15Merge remote-tracking branch 'public/bug24104_029_squashed' into maint-0.2.9Nick Mathewson
Resolved conflicts with the 26269 fix in 015fcd0e1191aa6f.
2018-11-15Merge remote-tracking branch 'dgoulet/bug27550_033_01' into maint-0.3.3Nick Mathewson
2018-11-14Work around check-spaces.Nick Mathewson
2018-11-14Changes file for bug 28419Nick Mathewson
2018-11-14libtorrunner: fix memory leak in child() error pathMartin Kepplinger
This avoids leaking memory in case libtorrunner's child() function fails.
2018-11-13Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-11-13Merge branch 'bug28413_029' into maint-0.2.9Nick Mathewson
2018-11-12Fix a compiler warning in aes.c.Nick Mathewson
Apparently some freebsd compilers can't tell that 'c' will never be used uninitialized. Fixes bug 28413; bugfix on 0.2.9.3-alpha when we added support for longer AES keys to this function.
2018-11-11Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-11-11Fix a bug in usage of SSL_set1_groups_list()Nick Mathewson
Apparently, even though the manpage says it returns an int, it can return a long instead and cause a warning. Bug not in any released Tor. Part of #28399
2018-11-11Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-11-11Update geoip and geoip6 to the November 6 2018 database.Karsten Loesing
2018-11-09Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-11-09Merge branch 'bug28245_029' into maint-0.2.9Nick Mathewson
2018-11-09Always declare groups when building with openssl 1.1.1 APIsNick Mathewson
Failing to do on clients was causing TLS 1.3 negotiation to fail. Fixes bug 28245; bugfix on 0.2.9.15, when we added TLS 1.3 support.
2018-11-02Merge branch 'bug26470_032' into maint-0.3.3Nick Mathewson
2018-11-02Merge remote-tracking branch 'dgoulet/ticket27410_032_01' into maint-0.3.3Nick Mathewson
2018-10-31Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-10-31Merge remote-tracking branch 'tor-github/pr/436' into maint-0.2.9Nick Mathewson
2018-10-30Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3Nick Mathewson
2018-10-25Merge branch 'bug28202_029' into bug28202_033Nick Mathewson
2018-10-25Fix two other cases of (buf + N > end) patternNick Mathewson
Related to fix for 28202.
2018-10-25Fix possible UB in an end-of-string check in get_next_token().Nick Mathewson
Remember, you can't check to see if there are N bytes left in a buffer by doing (buf + N < end), since the buf + N computation might take you off the end of the buffer and result in undefined behavior. Fixes 28202; bugfix on 0.2.0.3-alpha.
2018-10-23Remove a now-unused rust "use".Nick Mathewson
2018-10-23Merge remote-tracking branch 'onionk/rust-allsupportednull1' into maint-0.3.3Nick Mathewson
2018-10-23Treat backtrace test failures as expected on most BSD-derived systemsteor
Treat backtrace test failures as expected on NetBSD, OpenBSD, and macOS/Darwin, until we solve bug 17808. (FreeBSD failures have been treated as expected since 18204 in 0.2.8.) Fixes bug 27948; bugfix on 0.2.5.2-alpha.
2018-10-17Log more info for duplicate ed25519 IDsTaylor Yu
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-15Fix another tor_assert(0) caseNick Mathewson
2018-10-15Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-10-15Fix make check-spaces.Nick Mathewson
2018-10-15Adjust tor_assert_unreached()Nick Mathewson
This version of the macro makes it obvious to the compiler that "tor_assert_unreached()" will always abort().
2018-10-15Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-10-15Merge branch 'bug27709_029' into maint-0.2.9Nick Mathewson
2018-10-15Explain a bit more about branch prediction in the unit-test caseNick Mathewson
2018-10-10Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-10-10Merge remote-tracking branch 'tor-github/pr/392' into maint-0.2.9Nick Mathewson
2018-10-10Merge remote-tracking branch 'teor/bug27738-032' into bug27738-033Taylor Yu
2018-10-10Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-10-10Update geoip and geoip6 to the October 9 2018 database.Karsten Loesing
2018-09-24hs-v3: Silence some logging for client authorizationDavid Goulet
If a tor client gets a descriptor that it can't decrypt, chances are that the onion requires client authorization. If a tor client is configured with client authorization for an onion but decryption fails, it means that the configured keys aren't working anymore. In both cases, we'll log notice the former and log warn the latter and the rest of the decryption errors are now at info level. Two logs statement have been removed because it was redundant and printing the fetched descriptor in the logs when 80% of it is encrypted wat not helping. Fixes #27550 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-09-24Merge branch 'maint-0.3.3' of https://git.torproject.org/tor into maint-0.3.3David Goulet
2018-09-21Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-09-21Merge branch 'maint-0.2.9' into maint-0.3.2maint-0.3.2Nick Mathewson
2018-09-21rust/protover: return C-allocated string in protover_all_supported()cypherpunks
The result of CString::into_raw() is not safe to free with free() except under finicky and fragile circumstances that we definitely don't meet right now. This was missed in be583a34a3815c2c10e86094ab0610e4b7f9c869.
2018-09-21rust/protover: fix null deref in protover_all_supported()cypherpunks
Fortunately with the current callers it couldn't happen in practice. Fix on d1820c1516a31a149fc51a9e5126bf899e4c4e08.
2018-09-20Merge branch 'maint-0.3.3' of https://git.torproject.org/tor into maint-0.3.3David Goulet
2018-09-20hs-v3: Close all SOCKS request on descriptor failureDavid Goulet
Client side, when a descriptor is finally fetched and stored in the cache, we then go over all pending SOCKS request for that descriptor. If it turns out that the intro points are unusable, we close the first SOCKS request but not the others for the same .onion. This commit makes it that we'll close all SOCKS requests so we don't let hanging the other ones. It also fixes another bug which is having a SOCKS connection in RENDDESC_WAIT state but with a descriptor in the cache. At some point, tor will expire the intro failure cache which will make that descriptor usable again. When retrying all SOCKS connection (retry_all_socks_conn_waiting_for_desc()), we won't end up in the code path where we have already the descriptor for a pending request causing a BUG(). Bottom line is that we should never have pending requests (waiting for a descriptor) with that descriptor in the cache (even if unusable). Fixees #27410. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-09-20Merge branch 'maint-0.3.2' of https://git.torproject.org/tor into maint-0.3.2David Goulet
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion