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,458 Commits 53 Branches 631 Tags
60bc9675da30e266f9d22e2db3db5adaaa73f6d0
Commit Graph

29458 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 27b9170475 Appveyor: add comments to the config file 
Documentation for 28399, 28454, and previous fixes.
 2018-11-15 19:23:41 +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
teor 4c3d61b5f2 Appveyor: Improve diagnostics 
Stop installing MSYS2 packages.
We're compiling for mingw, so we only need mingw packages.

Run pacman in verbose mode.

Explicitly install pkg-config and xz, to future-proof our builds.

Diagnostics for 28399.
 2018-11-15 19:23:29 +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 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 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 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 73378e9ac1 Merge branch 'maint-0.3.4' into release-0.3.4 2018-11-11 18:05:45 -05:00
Nick Mathewson 1fce9d1296 Merge branch 'maint-0.3.3' into maint-0.3.4 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 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 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 336f1fad32 Merge branch 'maint-0.3.4' into release-0.3.4 2018-11-02 13:02:02 -04:00
Nick Mathewson 5acf6f8717 Bump to 0.3.4.9-dev 2018-11-02 13:01:32 -04:00
Nick Mathewson 4ac3ccf286 Copy 0.3.4.9 changelog into releasenotes tor-0.3.4.9 2018-11-02 11:28:14 -04:00
Nick Mathewson 563e761be5 Reflow new entries. 2018-11-02 09:25:50 -04:00
Nick Mathewson 928bfdc89e Draft an 0.3.4.9 changelog 2018-11-02 09:24:31 -04:00
Nick Mathewson a6240d578e Merge branch 'maint-0.3.4' into release-0.3.4 2018-11-02 09:09:01 -04:00
Nick Mathewson d8d4fe83d0 Bump to 0.3.4.9 2018-11-02 09:08:45 -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
Nick Mathewson 6bd069630a Merge branch 'bug26470_032' into maint-0.3.3 2018-11-02 09:06:32 -04:00
Nick Mathewson 1c5e7430ef Merge branch 'maint-0.3.4' into release-0.3.4 2018-11-02 09:05:18 -04:00
Nick Mathewson f288f2478a Merge branch 'bug26896_034' into maint-0.3.4 2018-11-02 09:05:14 -04:00