d6552a7a23
Merge branch 'maint-0.3.3' into release-0.3.3
2019-01-03 09:02:39 -05:00
1ea3127188
Merge branch 'ticket28973_033_squashed' into maint-0.3.3
2019-01-03 09:01:40 -05:00
bf413829cb
Detect openssl bug 7712 and work around it.
...
In theory it would be better to detect this bug in advance, but this
approach is much simpler, and therefore safer to backport.
This closes tor issue 28973.
2019-01-03 09:00:47 -05:00
fd2d7c5d19
Merge branch 'maint-0.3.3' into release-0.3.3
2018-12-11 10:00:22 -05:00
93019b4787
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-12-11 10:00:22 -05:00
3b5188576f
Note ticket number in changes file for 24803
2018-12-11 10:00:19 -05:00
8be8cc50ed
Merge branch 'maint-0.3.3' into release-0.3.3
2018-12-11 09:41:05 -05:00
c1f9191581
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-12-11 09:41:04 -05:00
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
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
12b68854a0
Merge branch 'maint-0.3.3' into release-0.3.3
2018-12-06 09:26:32 -05:00
00341d97f3
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-12-06 09:26:32 -05:00
57798eb1cb
Update geoip and geoip6 to the December 5 2018 database.
2018-12-05 21:02:39 +01:00
8c1eb28d61
Merge branch 'maint-0.3.3' into release-0.3.3
2018-12-01 11:15:09 -05:00
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
b3235e21ab
Merge branch 'maint-0.3.3' into release-0.3.3
2018-11-15 16:56:11 -05:00
cbe04d4550
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-11-15 16:54:16 -05:00
e8708c2fbd
Merge branch 'maint-0.3.3' into release-0.3.3
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
b120d8b836
Merge branch 'maint-0.3.3' into release-0.3.3
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
cca803e2b0
Merge branch 'maint-0.3.3' into release-0.3.3
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
15c99be963
Merge branch 'maint-0.3.3' into release-0.3.3
2018-11-13 08:27:28 -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
c079be8c7d
Merge branch 'maint-0.3.3' into release-0.3.3
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
c15a556a98
Merge branch 'maint-0.3.3' into release-0.3.3
2018-11-11 11:57:52 -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
93cf98cbb1
Merge branch 'maint-0.3.3' into release-0.3.3
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
dd0b851794
Merge branch 'maint-0.3.3' into release-0.3.3
2018-11-02 09:06:37 -04:00
6bd069630a
Merge branch 'bug26470_032' into maint-0.3.3
2018-11-02 09:06:32 -04:00
e0f4e6a2eb
Merge branch 'maint-0.3.3' into release-0.3.3
2018-11-02 09:04:25 -04:00
e847909b71
Merge remote-tracking branch 'dgoulet/ticket27410_032_01' into maint-0.3.3
2018-11-02 09:04:20 -04:00
73eebf4c8e
Merge branch 'maint-0.3.3' into release-0.3.3
2018-10-31 11:01:41 -04:00
bcc1a71808
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-10-31 11:01:40 -04:00
0a824bd889
Merge remote-tracking branch 'tor-github/pr/436' into maint-0.2.9
2018-10-31 11:01:36 -04:00
1cc8c1e8a5
Merge branch 'maint-0.3.3' into release-0.3.3
2018-10-30 09:34:04 -04:00
038bc21f88
Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3
2018-10-30 09:33:36 -04:00
f4d7a7527f
Merge branch 'maint-0.3.3' into release-0.3.3
2018-10-29 15:57:30 -04:00
Nick Mathewson
teor
Karsten Loesing
Martin Kepplinger