summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2018-11-15Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-11-15Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-11-15Merge branch 'maint-0.3.3' into maint-0.3.4Nick 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 branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-11-15Merge remote-tracking branch 'dgoulet/bug27550_033_01' into maint-0.3.3Nick Mathewson
2018-11-14Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-11-14Work around check-spaces.Nick 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.3.3' into maint-0.3.4Nick Mathewson
2018-11-13Merge branch 'maint-0.2.9' into maint-0.3.3Nick 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.3.3' into maint-0.3.4Nick Mathewson
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.3.3' into maint-0.3.4Nick Mathewson
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.3.3' into maint-0.3.4Nick Mathewson
2018-11-09Merge branch 'maint-0.2.9' into maint-0.3.3Nick 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-02Bump to 0.3.4.9-devNick Mathewson
2018-11-02Bump to 0.3.4.9Nick Mathewson
2018-11-02Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-11-02Merge branch 'bug26470_032' into maint-0.3.3Nick Mathewson
2018-11-02Merge branch 'bug26896_034' into maint-0.3.4Nick Mathewson
2018-11-02Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-11-02Merge remote-tracking branch 'dgoulet/ticket27410_032_01' into maint-0.3.3Nick Mathewson
2018-10-31Merge branch 'maint-0.3.3' into maint-0.3.4Nick 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 branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-10-30Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3Nick Mathewson
2018-10-29Merge branch 'maint-0.3.3' into maint-0.3.4Nick 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-24node: Make node_supports_v3_rendezvous_point() also check for the keyDavid Goulet
It is not enough to look at protover for v3 rendezvous support but also we need to make sure that the curve25519 onion key is present or in other words that the descriptor has been fetched and does contain it. Fixes #27797. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-10-23Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-10-23Remove a now-unused rust "use".Nick Mathewson
2018-10-23Merge branch 'maint-0.3.3' into maint-0.3.4Nick 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-18Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
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-17conn: Stop writing when our write bandwidth limist is exhaustedDavid Goulet
Commit 488e2b00bf881b97bcc8e4bbe304845ff1d79a03 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-16mainloop: Set client role if ControlPort is setDavid Goulet
It turns out that if _only_ the ControlPort is set and nothing else, tor would simply not bootstrap and thus not start properly. Commit 67a41b63063370c2 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 67a41b63063370c2 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-16test: Update approx_time before the test startsDavid Goulet
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-15Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion