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,485 Commits 53 Branches 631 Tags
221db44c6b162a9e5bd2c1e1acf2e4efea7247ec
Commit Graph

7153 Commits

Author SHA1 Message Date
Nick Mathewson 221db44c6b Merge branch 'maint-0.3.4' into release-0.3.4 2018-12-11 09:41:05 -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 c1f9191581 Merge branch 'maint-0.2.9' into maint-0.3.3 2018-12-11 09:41:04 -05: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 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
Nick Mathewson f1c58bbf42 Merge branch 'maint-0.3.4' into release-0.3.4 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
Karsten Loesing 57798eb1cb Update geoip and geoip6 to the December 5 2018 database. 2018-12-05 21:02:39 +01:00
Nick Mathewson 92fb9f9342 Merge branch 'maint-0.3.4' into release-0.3.4 2018-12-01 11:15:09 -05:00
Nick Mathewson e3a19b1c78 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-12-01 11:15:09 -05:00
Nick Mathewson 84b2197571 Merge branch 'maint-0.3.4' into release-0.3.4 2018-11-27 12:03:50 -05:00
Alexander Færøy 36c3235534 Explicitly specify path to OpenSSL for Appveyor. 
This patch explicitly specifies the path to our OpenSSL dependency and
disables the installation of an external OpenSSL version and instead
uses the OpenSSL version available from the MinGW environments.

See: https://bugs.torproject.org/28574
 2018-11-27 14:53:50 +01:00
teor ffc7b81b5d Test: Fix memory leaks and missing unmocks in entry guard tests 
test_entry_guard_outdated_dirserver_exclusion leaks memory, and is
missing some unmocks.

Fixes 28554; bugfix on 0.3.0.1-alpha.
 2018-11-22 16:42:32 +10:00
Nick Mathewson 79b40a910f Merge branch 'maint-0.3.4' into release-0.3.4 2018-11-20 13:10:38 -05:00
Nick Mathewson 9da8cd0bc3 Merge remote-tracking branch 'teor/ticket28459-034' into maint-0.3.4 2018-11-20 13:10:18 -05:00
Nick Mathewson 8517e2d6e9 Merge branch 'maint-0.3.4' into release-0.3.4 2018-11-15 17:08:34 -05:00
Nick Mathewson 80a6228aac Merge branch 'bug25573-034-typefix' into maint-0.3.4 2018-11-15 16:58:16 -05:00
Nick Mathewson 60bc9675da Merge branch 'maint-0.3.4' into release-0.3.4 2018-11-15 16:56:11 -05:00
Nick Mathewson 15e752e6b1 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-11-15 16:54:56 -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 57ff374303 Merge branch 'maint-0.3.4' into release-0.3.4 2018-11-15 16:47:25 -05:00
Nick Mathewson 63312e0299 Merge branch 'maint-0.3.3' into maint-0.3.4 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 115fb2a844 Merge branch 'maint-0.3.4' into release-0.3.4 2018-11-15 16:37:41 -05:00
Nick Mathewson 1e6ffeaeaa Merge branch 'maint-0.3.3' into maint-0.3.4 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 d94715e2d0 Merge branch 'maint-0.3.4' into release-0.3.4 2018-11-15 09:06:18 -05:00
teor b8ce1de4bf Appveyor: always show the logs, and upload them as build artifacts 
Always show the configure and test logs, and upload them as build
artifacts, when building for Windows using Appveyor CI.

Implements 28459.
 2018-11-15 21:04:17 +10:00
teor 83c1baca16 Appveyor: manually add zstd flags to configure 
The mingw zstd from MSYS2 doesn't come with a pkg-config file.

Fixes 28454 on Tor 0.3.4.1-alpha.
 2018-11-15 19:23:37 +10:00
teor 540c833f20 Appveyor: remove incorrect OpenSSL path 
Fixes 28399 on 0.3.4.1-alpha.
 2018-11-15 19:23:33 +10:00
Nick Mathewson f41374b035 Merge branch 'maint-0.3.4' into release-0.3.4 2018-11-14 07:55:07 -05:00
Nick Mathewson 1043532a51 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-11-14 07:55:07 -05:00
Nick Mathewson 26fd7c1d9c Changes file for bug 28419 2018-11-14 07:51:36 -05:00
Nick Mathewson 6b2c1d62a5 Merge branch 'maint-0.3.4' into release-0.3.4 2018-11-13 08:27:29 -05:00
Nick Mathewson 42be1c668b Merge branch 'maint-0.3.3' into maint-0.3.4 2018-11-13 08:27:29 -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 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 8714e98e88 Merge branch 'maint-0.3.4' into release-0.3.4 2018-11-11 11:57:53 -05:00
Nick Mathewson 6b2ff4fff8 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-11-11 11:57:53 -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 3ce2d8c4ad Merge branch 'maint-0.3.4' into release-0.3.4 2018-11-09 10:49:47 -05:00
Nick Mathewson 591a189fa4 Merge branch 'maint-0.3.3' into maint-0.3.4 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 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 928bfdc89e Draft an 0.3.4.9 changelog 2018-11-02 09:24:31 -04:00
Nick Mathewson d3769dd4d0 Merge branch 'maint-0.3.4' into release-0.3.4 2018-11-02 09:06:37 -04:00
Nick Mathewson bfe8f50cc8 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-11-02 09:06:37 -04:00