c159617c0c
Start an 0.2.8.13 changelog
2017-02-23 16:08:09 -05:00
a33d9f9b2b
Merge branch 'maint-0.2.8' into release-0.2.8
2017-02-15 07:53:13 -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
383fdeca12
Merge branch 'maint-0.2.8' into release-0.2.8
2017-02-15 07:50:58 -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
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
635c5a8a92
be sure to remember the changes file for #20384
2017-02-13 15:22:36 -05:00
d309d28ca5
Merge branch 'maint-0.2.8' into release-0.2.8
2017-02-13 14:39:21 -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
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
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
6b37512dc7
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-02-07 08:54:47 -05:00
d6eae78e29
Merge remote-tracking branch 'public/bug19152_024_v2' into maint-0.2.4
2017-02-07 08:47:11 -05:00
8936c50d83
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-07 08:39:07 -05:00
05ec055c41
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-02-07 08:38:59 -05:00
51675f97d3
Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.4
2017-02-07 08:37:07 -05:00
332543baed
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-02-07 08:34:08 -05:00
fb7d1f41b4
Make memwipe() do nothing when passed a NULL pointer or zero size
...
Check size argument to memwipe() for underflow.
Closes bug #18089 . Reported by "gk", patch by "teor".
Bugfix on 0.2.3.25 and 0.2.4.6-alpha (#7352 ),
commit 49dd5ef3
2017-02-07 08:33:39 -05:00
053e11f397
Fix out-of-bounds read in INTRODUCE2 client auth
...
The length of auth_data from an INTRODUCE2 cell is checked when the
auth_type is recognized (1 or 2), but not for any other non-zero
auth_type. Later, auth_data is assumed to have at least
REND_DESC_COOKIE_LEN bytes, leading to a client-triggered out of bounds
read.
Fixed by checking auth_len before comparing the descriptor cookie
against known clients.
Fixes #15823 ; bugfix on 0.2.1.6-alpha.
2017-02-07 08:31:37 -05:00
0691feda26
Merge branch 'maint-0.2.8' into release-0.2.8
2017-01-11 09:13:24 -05:00
c77ace69bb
Merge branch 'maint-0.2.7' into maint-0.2.8
2017-01-11 09:13:15 -05:00
8c91cbb6ca
Merge branch 'maint-0.2.6' into maint-0.2.7
2017-01-11 09:12:51 -05:00
54771bcaba
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-01-11 09:12:21 -05:00
34fdd510ef
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-01-11 09:11:58 -05:00
3833f67dd2
Update geoip and geoip6 to the January 4 2017 database.
2017-01-04 10:19:52 +01:00
2673b4b7a8
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-12-20 18:23:19 -05:00
b6227edae1
Add a one-word sentinel value of 0x0 at the end of each buf_t chunk
...
This helps protect against bugs where any part of a buf_t's memory
is passed to a function that expects a NUL-terminated input.
It also closes TROVE-2016-10-001 (aka bug 20384).
2016-12-20 18:22:53 -05:00
a9c8a5ff18
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-12-20 18:14:21 -05:00
b18bde23cf
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-12-20 18:11:25 -05:00
db58d4d16f
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-12-20 18:11:08 -05:00
9b024fb281
0.2.8.12 releasenotes
2016-12-19 08:26:15 -05:00
5d68e5b8fc
Merge branch 'maint-0.2.8' into release-0.2.8
2016-12-19 08:01:27 -05:00
c11de4c45f
Merge branch 'bug21018_024' into maint-0.2.8
2016-12-19 07:58:21 -05:00
6a00e703a2
Merge branch 'maint-0.2.8' into release-0.2.8
2016-12-19 07:30:30 -05:00
Nick Mathewson
Roger Dingledine
Karsten Loesing
teor (Tim Wilson-Brown)
John Brooks