70624a3be7
Merge branch 'maint-0.3.4' into release-0.3.4
2018-10-10 14:27:27 -04:00
48182c147b
Merge branch 'appveyor_pacman_fixes_034' into maint-0.3.4
2018-10-10 14:27:24 -04:00
1310252326
Merge branch 'maint-0.3.4' into release-0.3.4
2018-10-10 11:34:49 -04:00
e5fe8b0e3a
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-10 11:34:49 -04:00
b057623bed
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-10-10 11:34:48 -04:00
119df9c1c0
Update geoip and geoip6 to the October 9 2018 database.
2018-10-10 17:26:41 +02:00
c6b5b43d92
fixup! Changes file for apveyor changes
2018-10-10 11:10:29 -04:00
8c0009a8de
Changes file for apveyor changes
2018-10-10 10:22:08 -04:00
7001162b8e
Merge branch 'maint-0.3.4' into release-0.3.4
2018-09-24 11:10:38 -04:00
f57d8722e0
Fix the 0.3.4 part of bug 27781 (arm compilation)
...
Because with arm on OpenSSL <1.1 we don't define USE_EVP_AES_CTR, we
need to include crypto_util.h here.
2018-09-24 11:08:27 -04:00
08aaedb015
Merge branch 'maint-0.3.4' into release-0.3.4
2018-09-21 09:35:54 -04:00
e818a71905
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-21 09:35:54 -04:00
2cadd93cea
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-21 09:35:51 -04:00
5b04392c15
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-21 09:35:23 -04:00
4149b15540
Merge branch 'maint-0.3.4' into release-0.3.4
2018-09-20 10:43:08 -04:00
163230e240
Merge remote-tracking branch 'github/bug27139_034' into maint-0.3.4
2018-09-20 10:43:05 -04:00
3384638c6d
Merge branch 'maint-0.3.4' into release-0.3.4
2018-09-18 08:31:14 -04:00
2ddbaf9cdc
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-18 08:31:14 -04:00
75b95e1c8e
Merge remote-tracking branch 'onionk/rust-allsupported1' into maint-0.3.3
2018-09-18 08:31:08 -04:00
c1e0206365
Merge branch 'maint-0.3.4' into release-0.3.4
2018-09-14 12:56:30 -04:00
6f47734ea8
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-14 12:56:30 -04:00
a546e07600
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-14 12:56:30 -04:00
0971b3ce4d
hs-v3: Don't BUG() on directory permission check failure
...
In hs_config.c, we do validate the permission of the hidden service directory
but we do not try to create it. So, in the event that the directory doesn't
exists, we end up in the loading key code path which checks for the
permission and possibly creates the directory. On failure, don't BUG() since
there is a perfectly valid use case for that function to fail.
Fixes #27335
Signed-off-by: David Goulet <dgoulet@torproject.org >
2018-09-14 12:56:26 -04:00
c613d55134
rust/protover: use .and_not_in() instead of .retain() in all_supported()
...
.retain() would allocating a Vec of billions of integers and check them
one at a time to separate the supported versions from the unsupported.
This leads to a memory DoS.
Closes ticket 27206. Bugfix on e6625113c9
2018-09-14 15:08:55 +00:00
1ab85566d8
Merge branch 'maint-0.3.4' into release-0.3.4
2018-09-14 10:48:01 -04:00
8f689e0eb2
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-14 10:48:01 -04:00
281854bab7
If options_act() fails, restore the previous value of global_options
...
Before 0.3.3.1-alpha, we would exit() in this case immediately. But
now that we leave tor_main() more conventionally, we need to make
sure we restore things so as not to cause a double free.
Fixes bug 27708; bugfix on 0.3.3.1-alpha.
2018-09-14 10:34:45 -04:00
bd4c50f36b
Merge branch 'maint-0.3.4' into release-0.3.4
2018-09-14 09:25:34 -04:00
82b1282772
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-14 09:25:34 -04:00
9a90f4c6b4
Changes file for the 32-bit msec conversion fixes of #27139
2018-09-14 08:49:27 -04:00
e24195c7c1
protover: reject invalid protocol names
...
The spec only allows the characters [A-Za-z0-9-].
Fix on b2b2e1c7f2Fixes #27316 ; bugfix on 0.2.9.4-alpha.
2018-09-14 02:18:04 +00:00
7c26f88fd7
rust/protover: validate unknown protocol names use only allowed characters
2018-09-13 16:33:58 +00:00
9697c2da46
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-13 11:46:04 -04:00
5e94c93841
Merge branch 'maint-0.3.4' into release-0.3.4
2018-09-13 11:46:04 -04:00
3ddfd5ff25
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-13 11:46:04 -04:00
8253428253
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-13 11:46:04 -04:00
04f210811e
Merge branch 'maint-0.3.4' into release-0.3.4
2018-09-12 17:24:41 -04:00
f8d5fb42a3
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-12 17:24:41 -04:00
4fa46fca8e
fixup! changes file
2018-09-12 14:22:31 +00:00
73a37d1e54
Check waitpid return value and exit status in tinytest.c
...
It's possible for a unit test to report success via its pipe, but to
fail as it tries to clean up and exit. Notably, this happens on a
leak sanitizer failure.
Fixes bug 27658; bugfix on 0.2.2.4-alpha when tinytest was
introduced.
2018-09-12 08:57:18 -04:00
204a90c935
Merge branch 'maint-0.3.4' into release-0.3.4
2018-09-12 08:17:45 -04:00
73ba308d3d
Merge remote-tracking branch 'teor/bug27464-034' into maint-0.3.4
2018-09-12 08:17:42 -04:00
03c4d0ab9c
rust/protover: fix check for overlapping ranges
...
Closes ticket 27649. Bugfix on e6625113c9
2018-09-12 02:47:59 +00:00
80b13f7e1e
Merge branch 'maint-0.3.4' into release-0.3.4
2018-09-11 15:53:06 -04:00
affbe376f9
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-11 15:53:06 -04:00
ae1aea4cc4
Bug 25505: Check circuitmux queues before padding.
2018-09-11 15:53:03 -04:00
3372049154
Merge branch 'maint-0.3.4' into release-0.3.4
2018-09-11 13:09:21 -04:00
46bccc50e5
Merge remote-tracking branch 'teor/ticket27252-034' into maint-0.3.4
2018-09-11 13:09:18 -04:00
8e714d2a02
Merge remote-tracking branch 'teor/ticket27252-033' into maint-0.3.3
2018-09-11 13:09:09 -04:00
c3a750486c
Merge remote-tracking branch 'teor/ticket27252-032' into maint-0.3.2
2018-09-11 13:09:04 -04:00
Nick Mathewson
Karsten Loesing
David Goulet
cypherpunks
Mike Perry