79b40a910f
Merge branch 'maint-0.3.4' into release-0.3.4
2018-11-20 13:10:38 -05:00
9da8cd0bc3
Merge remote-tracking branch 'teor/ticket28459-034' into maint-0.3.4
2018-11-20 13:10:18 -05:00
8517e2d6e9
Merge branch 'maint-0.3.4' into release-0.3.4
2018-11-15 17:08:34 -05:00
fe1fb4b0c3
Merge remote-tracking branch 'public/ticket27686_034' into maint-0.3.4
2018-11-15 17:01:54 -05:00
80a6228aac
Merge branch 'bug25573-034-typefix' into maint-0.3.4
2018-11-15 16:58:16 -05:00
60bc9675da
Merge branch 'maint-0.3.4' into release-0.3.4
2018-11-15 16:56:11 -05:00
15e752e6b1
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-11-15 16:54:56 -05:00
cbe04d4550
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-11-15 16:54:16 -05:00
57ff374303
Merge branch 'maint-0.3.4' into release-0.3.4
2018-11-15 16:47:25 -05:00
63312e0299
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-11-15 16:47:25 -05:00
aebe8a82c9
Merge branch 'bug26913_033' into maint-0.3.3
2018-11-15 16:47:22 -05:00
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
115fb2a844
Merge branch 'maint-0.3.4' into release-0.3.4
2018-11-15 16:37:41 -05:00
1e6ffeaeaa
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-11-15 16:37:41 -05:00
34e4d5a783
Merge remote-tracking branch 'dgoulet/bug27550_033_01' into maint-0.3.3
2018-11-15 16:37:02 -05:00
d94715e2d0
Merge branch 'maint-0.3.4' into release-0.3.4
2018-11-15 09:06:18 -05:00
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
27b9170475
Appveyor: add comments to the config file
...
Documentation for 28399, 28454, and previous fixes.
2018-11-15 19:23:41 +10:00
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
540c833f20
Appveyor: remove incorrect OpenSSL path
...
Fixes 28399 on 0.3.4.1-alpha.
2018-11-15 19:23:33 +10:00
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
f41374b035
Merge branch 'maint-0.3.4' into release-0.3.4
2018-11-14 07:55:07 -05:00
1043532a51
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-11-14 07:55:07 -05:00
db3acb3aa3
Work around check-spaces.
2018-11-14 07:54:57 -05:00
26fd7c1d9c
Changes file for bug 28419
2018-11-14 07:51:36 -05:00
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
6b2c1d62a5
Merge branch 'maint-0.3.4' into release-0.3.4
2018-11-13 08:27:29 -05:00
42be1c668b
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-11-13 08:27:29 -05:00
54d1a2d805
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-11-13 08:27:17 -05:00
7f042cbc0a
Merge branch 'bug28413_029' into maint-0.2.9
2018-11-13 08:26:51 -05:00
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
73378e9ac1
Merge branch 'maint-0.3.4' into release-0.3.4
2018-11-11 18:05:45 -05:00
1fce9d1296
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-11-11 18:05:45 -05:00
93b6d41374
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-11-11 18:05:45 -05:00
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
8714e98e88
Merge branch 'maint-0.3.4' into release-0.3.4
2018-11-11 11:57:53 -05:00
6b2ff4fff8
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-11-11 11:57:53 -05:00
d0c3723c38
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-11-11 11:57:52 -05:00
5ba3d09a89
Update geoip and geoip6 to the November 6 2018 database.
2018-11-11 11:25:59 +01:00
3ce2d8c4ad
Merge branch 'maint-0.3.4' into release-0.3.4
2018-11-09 10:49:47 -05:00
591a189fa4
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-11-09 10:49:47 -05:00
c06b7f090c
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-11-09 10:49:47 -05:00
45e0004b69
Merge branch 'bug28245_029' into maint-0.2.9
2018-11-09 10:49:43 -05:00
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
336f1fad32
Merge branch 'maint-0.3.4' into release-0.3.4
2018-11-02 13:02:02 -04:00
5acf6f8717
Bump to 0.3.4.9-dev
2018-11-02 13:01:32 -04:00
4ac3ccf286
Copy 0.3.4.9 changelog into releasenotes
2018-11-02 11:28:14 -04:00
563e761be5
Reflow new entries.
2018-11-02 09:25:50 -04:00
928bfdc89e
Draft an 0.3.4.9 changelog
2018-11-02 09:24:31 -04:00
a6240d578e
Merge branch 'maint-0.3.4' into release-0.3.4
2018-11-02 09:09:01 -04:00
Nick Mathewson
teor
Martin Kepplinger
Karsten Loesing