efa5bbaba0
Merge branch 'maint-0.3.0'
2017-02-17 11:47:49 -05:00
823fb68a14
Remove a redundant check in ..transition_affects_guards()
...
scan-build found that we we checking UseEntryGuards twice.
Fixes bug 21492.
2017-02-17 11:47:25 -05:00
31be66ea5a
Merge remote-tracking branch 'meejah/ticket-21329-onions-current'
2017-02-16 09:40:56 -05:00
3336f26e60
hs: Avoid a strlen(NULL) if descriptor is not found in cache
...
Instead of returning 404 error code, this led to a NULL pointer being used and
thus a crash of tor.
Fixes #21471
Signed-off-by: David Goulet <dgoulet@torproject.org >
2017-02-15 10:27:41 -05:00
39af9fc2b7
Merge branch 'bug21447'
2017-02-15 08:08:25 -05:00
62f98ad485
Merge branch 'maint-0.2.9'
2017-02-15 07:58:15 -05:00
cb6b3b7cad
Limit version numbers to 0...INT32_MAX.
...
Closes 21450; patch from teor.
2017-02-15 07:57:34 -05:00
76d79d597a
Merge branch 'maint-0.2.9'
2017-02-15 07:48:42 -05:00
5d88267bf4
Merge branch 'bug21278_extra_029' into maint-0.2.9
2017-02-15 07:48:30 -05:00
ec6b5a098d
Merge branch 'bug21278_redux_029_squashed' into maint-0.2.9
2017-02-15 07:48:18 -05:00
eeb743588a
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-02-15 07:48:10 -05:00
1ebdae6171
Merge branch 'maint-0.2.7' into maint-0.2.8
2017-02-15 07:47:28 -05:00
ed806843dc
Merge branch 'maint-0.2.6' into maint-0.2.7
2017-02-15 07:47:21 -05:00
3781f24b80
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-15 07:47:12 -05:00
a452b71395
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-02-15 07:47:04 -05:00
02e05bd74d
When examining descriptors as a dirserver, reject ones with bad versions
...
This is an extra fix for bug 21278: it ensures that these
descriptors and platforms will never be listed in a legit consensus.
2017-02-15 07:46:34 -05:00
dec7dc3d82
Merge remote-tracking branch 'dgoulet/ticket20656_030_01'
2017-02-14 19:15:10 -05:00
7e469c1002
Merge branch 'bug20894_029_v3'
2017-02-14 19:10:20 -05:00
491348cb8c
Rename make fuzz to make test-fuzz-corpora
2017-02-14 18:04:10 -05:00
ff088ea7d7
fixup! Don't atoi off the end of a buffer chunk.
...
Credit AFL in the changes file.
2017-02-14 16:44:58 -05:00
c4f2faf301
Don't atoi off the end of a buffer chunk.
...
Fixes bug 20894; bugfix on 0.2.0.16-alpha.
We already applied a workaround for this as 20834, so no need to
freak out (unless you didn't apply 20384 yet).
2017-02-14 16:38:47 -05:00
9f71fde146
changes file for removing compare-by-subtraction pattern
2017-02-14 16:32:59 -05:00
194e31057f
Avoid integer underflow in tor_version_compare.
...
Fix for TROVE-2017-001 and bug 21278.
(Note: Instead of handling signed ints "correctly", we keep the old
behavior, except for the part where we would crash with -ftrapv.)
2017-02-14 16:10:27 -05:00
3f005c0433
protover: Add new version for prop224 for HSIntro/HSDir
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2017-02-14 10:51:18 -05:00
dca8ae5cfa
Merge remote-tracking branch 'dgoulet/bug21116_030_01'
2017-02-13 15:56:01 -05:00
635c5a8a92
be sure to remember the changes file for #20384
2017-02-13 15:22:36 -05:00
d9827e4729
Merge branch 'maint-0.2.9'
2017-02-13 14:41:43 -05:00
a86f95df5c
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-02-13 14:38:03 -05:00
9b90d515a9
Merge branch 'maint-0.2.7' into maint-0.2.8
2017-02-13 14:37:55 -05:00
75fe218b16
Merge branch 'maint-0.2.6' into maint-0.2.7
2017-02-13 14:37:49 -05:00
43c18b1b7a
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-13 14:37:42 -05:00
124062e843
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-02-13 14:37:01 -05:00
f6016058b4
Update geoip and geoip6 to the February 8 2017 database.
2017-02-12 15:56:31 +01:00
e129393e40
test: Add missing socket errno in test_util.c
...
According to 21116, it seems to be needed for Wheezy Raspbian build. Also,
manpage of socket(2) does confirm that this errno value should be catched as
well in case of no support from the OS of IPv4 or/and IPv6.
Fixes #21116
Signed-off-by: David Goulet <dgoulet@torproject.org >
2017-02-08 09:00:48 -05:00
4bce2072ac
Merge branch 'maint-0.2.6' into maint-0.2.7
2017-02-07 10:39:03 -05:00
f2a30413a3
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-07 10:37:53 -05:00
2ce4330249
Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5
2017-02-07 10:37:43 -05:00
c056d19323
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-02-07 10:37:31 -05:00
457d38a6e9
Change behavior on missing/present event to warn instead of asserting.
...
Add a changes file.
2017-02-07 09:48:19 -05:00
5446cb8d3d
Revert "Add hidserv-stats filname to our sandbox filter"
...
Reverting this in 0.2.6 only -- we're no backporting
seccomp2-loosening fixes to 0.2.6.
This reverts commit 2ec5e24c58
2017-02-07 09:28:50 -05:00
ea2f08ac7f
(this already went in to 0.3.0.3-alpha)
2017-02-07 09:27:37 -05:00
51dc284088
Merge branch 'maint-0.2.9'
2017-02-07 09:27:22 -05:00
a271ad2a7e
changes file for 21280
2017-02-07 09:27:17 -05:00
9379984128
Merge branch 'teor_bug21357-v2_029' into maint-0.2.9
2017-02-07 09:24:08 -05:00
dff390dcc7
Merge branch 'bug21108_029' into maint-0.2.9
2017-02-07 09:22:31 -05:00
c6f2ae514e
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-07 09:18:54 -05:00
b9ef21cf56
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-02-07 09:17:59 -05:00
e4a42242ea
Backport the tonga->bifroest move to 0.2.4.
...
This is a backport of 19728 and 19690
2017-02-07 09:15:21 -05:00
115cefdeee
Merge branch 'maint-0.2.6' into maint-0.2.7
2017-02-07 08:55:07 -05:00
e6965f78b8
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-07 08:54:54 -05:00
Nick Mathewson
David Goulet
Roger Dingledine
Karsten Loesing