4cdb7bf450
Fix 029 EOL
2017-02-23 16:49:04 -05:00
a98608efe8
Begin work on an 0.2.9.10 changelog
...
This one is much more normal than the 0.2.[45678] changelogs
I just started, since there has been a much shorter gap since the
most recent 0.2.9 release.
2017-02-23 16:18:17 -05:00
3c74bc73fc
Merge branch 'maint-0.2.9' into release-0.2.9
2017-02-17 11:32:38 -05:00
67cec7578c
Check for micro < 0, rather than checking "minor" twice.
...
Bug found with clang scan-build. Fixes bug on f63e06d3dc
2017-02-17 11:31:39 -05:00
2e334d90a6
Merge branch 'maint-0.2.9' into release-0.2.9
2017-02-15 08:19:44 -05:00
fea93abecd
whoops; make 21450 compile
2017-02-15 08:19:37 -05:00
ff649ec2d9
Merge branch 'maint-0.2.9' into release-0.2.9
2017-02-15 07:58:10 -05:00
cb6b3b7cad
Limit version numbers to 0...INT32_MAX.
...
Closes 21450; patch from teor.
2017-02-15 07:57:34 -05:00
35f449c8b9
Merge branch 'maint-0.2.9' into release-0.2.9
2017-02-15 07:53:15 -05:00
a1c3b391de
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-02-15 07:52:54 -05:00
5222054163
Merge branch 'maint-0.2.7' into maint-0.2.8
2017-02-15 07:52:47 -05:00
e6376a8004
Merge branch 'maint-0.2.6' into maint-0.2.7
2017-02-15 07:52:41 -05:00
f7ed4a7d8f
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-15 07:52:33 -05:00
71cd68b66b
Merge branch 'maint-0.2.8' of git-rw.torproject.org:/tor into maint-0.2.8
2017-02-15 07:51:57 -05:00
67877f55ad
Merge branch 'maint-0.2.7' of git-rw.torproject.org:/tor into maint-0.2.7
2017-02-15 07:51:48 -05:00
6e7ff9ee31
Merge branch 'maint-0.2.6' of git-rw.torproject.org:/tor into maint-0.2.6
2017-02-15 07:51:41 -05:00
aeb299ba6d
Merge branch 'maint-0.2.5' of git-rw.torproject.org:/tor into maint-0.2.5
2017-02-15 07:51:33 -05:00
563b8d9f22
Merge branch 'maint-0.2.9' into release-0.2.9
2017-02-15 07:51:01 -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
3c4da8a130
give tor_version_parse_platform some function documentation
2017-02-15 07:46:34 -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
f63e06d3dc
Extract the part of tor_version_as_new_as that extracts platform
...
Also add a "strict" mode to reject negative inputs.
2017-02-15 07:46:34 -05:00
9f71fde146
changes file for removing compare-by-subtraction pattern
2017-02-14 16:32:59 -05:00
a0ef3cf088
Prevent int underflow in dirvote.c compare_vote_rs_.
...
This should be "impossible" without making a SHA1 collision, but
let's not keep the assumption that SHA1 collisions are super-hard.
This prevents another case related to 21278. There should be no
behavioral change unless -ftrapv is on.
2017-02-14 16:31:23 -05:00
1afc2ed956
Fix policies.c instance of the "if (r=(a-b)) return r" pattern
...
I think this one probably can't underflow, since the input ranges
are small. But let's not tempt fate.
This patch also replaces the "cmp" functions here with just "eq"
functions, since nothing actually checked for anything besides 0 and
nonzero.
Related to 21278.
2017-02-14 16:31:11 -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
4a2afd5b33
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-02-13 15:41:20 -05:00
9ff76185d2
Merge branch 'maint-0.2.7' into maint-0.2.8
2017-02-13 15:39:13 -05:00
5c4235888a
Merge branch 'maint-0.2.6' into maint-0.2.7
2017-02-13 15:28:50 -05:00
e778a411b9
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-13 15:27:57 -05:00
144ec3d58c
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-02-13 15:23:50 -05:00
635c5a8a92
be sure to remember the changes file for #20384
2017-02-13 15:22:36 -05:00
11661747a5
Merge branch 'maint-0.2.9' into release-0.2.9
2017-02-13 14:39:23 -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
788a05a50f
Merge branch 'maint-0.2.9' into release-0.2.9
2017-02-07 10:39:58 -05:00
23f1caf2af
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-02-07 10:39:23 -05:00
eca4a89319
Merge branch 'maint-0.2.7' into maint-0.2.8
2017-02-07 10:39:13 -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
Nick Mathewson
Roger Dingledine
Karsten Loesing