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
28,615 Commits 53 Branches 631 Tags
b3235e21ab3dc2d31e6bd5a874290675ff4756bf
Commit Graph

28615 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson b3235e21ab Merge branch 'maint-0.3.3' into release-0.3.3 2018-11-15 16:56:11 -05:00
Nick Mathewson cbe04d4550 Merge branch 'maint-0.2.9' into maint-0.3.3 2018-11-15 16:54:16 -05:00
Nick Mathewson e8708c2fbd Merge branch 'maint-0.3.3' into release-0.3.3 2018-11-15 16:47:25 -05:00
Nick Mathewson aebe8a82c9 Merge branch 'bug26913_033' into maint-0.3.3 2018-11-15 16:47:22 -05:00
Nick Mathewson 8569166c70 Merge remote-tracking branch 'public/bug24104_029_squashed' into maint-0.2.9 
Resolved conflicts with the 26269 fix in 015fcd0e11.
 2018-11-15 16:43:50 -05:00
Nick Mathewson b120d8b836 Merge branch 'maint-0.3.3' into release-0.3.3 2018-11-15 16:37:41 -05:00
Nick Mathewson 34e4d5a783 Merge remote-tracking branch 'dgoulet/bug27550_033_01' into maint-0.3.3 2018-11-15 16:37:02 -05:00
Nick Mathewson cca803e2b0 Merge branch 'maint-0.3.3' into release-0.3.3 2018-11-14 07:55:07 -05:00
Nick Mathewson db3acb3aa3 Work around check-spaces. 2018-11-14 07:54:57 -05:00
Nick Mathewson 26fd7c1d9c Changes file for bug 28419 2018-11-14 07:51:36 -05:00
Martin Kepplinger 7ba1f39116 libtorrunner: fix memory leak in child() error path 
This avoids leaking memory in case libtorrunner's child() function fails.
 2018-11-14 07:49:51 -05:00
Nick Mathewson 15c99be963 Merge branch 'maint-0.3.3' into release-0.3.3 2018-11-13 08:27:28 -05:00
Nick Mathewson 54d1a2d805 Merge branch 'maint-0.2.9' into maint-0.3.3 2018-11-13 08:27:17 -05:00
Nick Mathewson 7f042cbc0a Merge branch 'bug28413_029' into maint-0.2.9 2018-11-13 08:26:51 -05:00
Nick Mathewson 1a11702a9a Fix a compiler warning in aes.c. 
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-12 15:39:28 -05:00
Nick Mathewson c079be8c7d Merge branch 'maint-0.3.3' into release-0.3.3 2018-11-11 18:05:45 -05:00
Nick Mathewson 93b6d41374 Merge branch 'maint-0.2.9' into maint-0.3.3 2018-11-11 18:05:45 -05:00
Nick Mathewson 46796623f9 Fix a bug in usage of SSL_set1_groups_list() 
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-11 18:03:50 -05:00
Nick Mathewson c15a556a98 Merge branch 'maint-0.3.3' into release-0.3.3 2018-11-11 11:57:52 -05:00
Nick Mathewson d0c3723c38 Merge branch 'maint-0.2.9' into maint-0.3.3 2018-11-11 11:57:52 -05:00
Karsten Loesing 5ba3d09a89 Update geoip and geoip6 to the November 6 2018 database. 2018-11-11 11:25:59 +01:00
Nick Mathewson 93cf98cbb1 Merge branch 'maint-0.3.3' into release-0.3.3 2018-11-09 10:49:47 -05:00
Nick Mathewson c06b7f090c Merge branch 'maint-0.2.9' into maint-0.3.3 2018-11-09 10:49:47 -05:00
Nick Mathewson 45e0004b69 Merge branch 'bug28245_029' into maint-0.2.9 2018-11-09 10:49:43 -05:00
Nick Mathewson 1ba1a1ceca Always declare groups when building with openssl 1.1.1 APIs 
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-09 10:10:25 -05:00
Nick Mathewson dd0b851794 Merge branch 'maint-0.3.3' into release-0.3.3 2018-11-02 09:06:37 -04:00
Nick Mathewson 6bd069630a Merge branch 'bug26470_032' into maint-0.3.3 2018-11-02 09:06:32 -04:00
Nick Mathewson e0f4e6a2eb Merge branch 'maint-0.3.3' into release-0.3.3 2018-11-02 09:04:25 -04:00
Nick Mathewson e847909b71 Merge remote-tracking branch 'dgoulet/ticket27410_032_01' into maint-0.3.3 2018-11-02 09:04:20 -04:00
Nick Mathewson 73eebf4c8e Merge branch 'maint-0.3.3' into release-0.3.3 2018-10-31 11:01:41 -04:00
Nick Mathewson bcc1a71808 Merge branch 'maint-0.2.9' into maint-0.3.3 2018-10-31 11:01:40 -04:00
Nick Mathewson 0a824bd889 Merge remote-tracking branch 'tor-github/pr/436' into maint-0.2.9 2018-10-31 11:01:36 -04:00
Nick Mathewson 1cc8c1e8a5 Merge branch 'maint-0.3.3' into release-0.3.3 2018-10-30 09:34:04 -04:00
Nick Mathewson 038bc21f88 Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3 2018-10-30 09:33:36 -04:00
Nick Mathewson f4d7a7527f Merge branch 'maint-0.3.3' into release-0.3.3 2018-10-29 15:57:30 -04:00
Nick Mathewson 8013e3e8b6 Merge branch 'bug28202_029' into bug28202_033 2018-10-25 09:14:06 -04:00
Nick Mathewson 0878bb961f Fix two other cases of (buf + N > end) pattern 
Related to fix for 28202.
 2018-10-25 09:08:02 -04:00
Nick Mathewson 368413a321 Fix possible UB in an end-of-string check in get_next_token(). 
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-25 09:06:13 -04:00
Nick Mathewson 5fde2c2544 Merge branch 'maint-0.3.3' into release-0.3.3 2018-10-23 19:54:16 -04:00
Nick Mathewson b2c52f5d6d Remove a now-unused rust "use". 2018-10-23 19:50:45 -04:00
Nick Mathewson 8a0728789b Merge branch 'maint-0.3.3' into release-0.3.3 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
teor 939657771c Treat backtrace test failures as expected on most BSD-derived systems 
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-23 11:21:10 +10:00
Nick Mathewson cf19065425 Merge branch 'maint-0.3.3' into release-0.3.3 2018-10-18 09:12:57 -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 ec638e2368 Merge branch 'maint-0.3.3' into release-0.3.3 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 e7827a2b73 Merge branch 'maint-0.3.3' into release-0.3.3 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