4a14c2cfc7
Merge branch 'maint-0.2.8'
2016-05-19 15:56:39 -04:00
dd17df2253
lintchanges on 18809, and fix the bug number
2016-05-19 08:54:19 -04:00
a7a44f2db0
Merge branch 'maint-0.2.8'
2016-05-19 08:29:58 -04:00
7c7d990704
changelog typo fix
2016-05-19 08:29:45 -04:00
d718c717a6
Merge branch 'maint-0.2.8'
2016-05-19 08:25:12 -04:00
9f217c83b0
Merge branch 'bug18809_028_squashed' into maint-0.2.8
2016-05-19 08:17:02 -04:00
8dc8d71226
Changes file for bug 18809
2016-05-19 07:58:40 -04:00
a7f6e434be
Merge branch 'maint-0.2.8'
2016-05-17 19:48:49 -04:00
3f49474349
Merge branch 'bug17150_027_extra' into maint-0.2.8
2016-05-17 19:47:22 -04:00
49ff09aef2
Fix another, more subtle, case of bug 17150.
...
We need to make sure that the corresponding sd and ei match in their
certificates.
2016-05-17 13:16:36 -04:00
7d1eb0d570
When making sure digest256 matches in ei, look at sd, not ri.
...
The routerinfo we pass to routerinfo_incompatible_with_extrainfo is
the latest routerinfo for the relay. The signed_descriptor_t, on
the other hand, is the signed_descriptor_t that corresponds to the
extrainfo. That means we should be checking the digest256 match
with that signed_descriptor_t, not with the routerinfo.
Fixes bug 17150 (and 19017); bugfix on 0.2.7.2-alpha.
2016-05-17 12:57:03 -04:00
36909674b4
Merge remote-tracking branch 'teor/bug18963-remember-v2'
2016-05-17 12:15:53 -04:00
5e5d4c99c1
Remove from master all changes files scheduled for 0.2.8.3
...
These won't go in the 0.2.9.1-alpha changelog, since 0.2.8.3 will
come out first.
Generated automatically with findMergedChanges.pl
2016-05-17 11:24:36 -04:00
6382cd93cb
Merge branch 'maint-0.2.8'
2016-05-17 11:10:20 -04:00
d6a2fec05e
Merge branch 'bug18616-v4-merged_028' into maint-0.2.8
2016-05-17 11:09:54 -04:00
49c83dd21a
Merge branch 'maint-0.2.8'
2016-05-17 11:06:52 -04:00
ff5eb7fc62
Fix remaining lintChanges warnings.
2016-05-17 11:06:41 -04:00
e0fb75c349
Resolve lintChanges warnings.
2016-05-17 11:05:57 -04:00
548d14247e
Merge remote-tracking branch 'arma/bug18616-v4' into maint-0.2.8
2016-05-17 10:48:12 -04:00
06031b441e
touchups and refactorings on bug 18616 branch
...
no behavior changes
2016-05-16 17:43:47 -04:00
060e0d0a75
Merge branch 'crypto_unit_tests_v2_squashed'
2016-05-16 08:26:11 -04:00
ec81329339
Do not leak the 'tag' when trying to read a truncated ed25519 key file
...
Fix for bug 18956.
2016-05-16 08:25:59 -04:00
7bc9d1e002
Merge branch 'maint-0.2.8'
2016-05-12 15:33:56 -04:00
e8cc9f3edf
Merge branch 'maint-0.2.7' into maint-0.2.8
2016-05-12 15:33:47 -04:00
4165b1a0da
Merge branch 'bug18977_026_v2' into maint-0.2.7
2016-05-12 15:33:35 -04:00
20b01cece8
Merge branch 'bug18977_024_v2' into bug18977_026_v2
...
Had conflicts related to other correct_tm bugs in 0.2.6. Added wday
for another case.
2016-05-12 14:39:06 -04:00
e57f26c135
Have correct_tm set tm_wday as well.
...
The tm_wday field had been left uninitialized, which was causing
some assertions to fail on Windows unit tests.
Fixes bug 18977.
2016-05-12 14:37:27 -04:00
607a9056d4
Merge branch 'ftrapv_v3'
...
There were some conflicts here, and some breakage to fix concerning
library link order in newer targets.
2016-05-12 13:00:45 -04:00
ce854a8d22
Add -ftrapv to gcc-hardening ... mostly!
...
We know there are overflows in curve25519-donna-c32, so we'll have
to have that one be fwrapv.
Only apply the asan, ubsan, and trapv options to the code that does
not need to run in constant time. Those options introduce branches
to the code they instrument.
(These introduced branches should never actually be taken, so it
might _still_ be constant time after all, but branch predictors are
complicated enough that I'm not really confident here. Let's aim for
safety.)
Closes 17983.
2016-05-12 11:21:28 -04:00
58e0e587a6
Merge branch 'maint-0.2.8'
2016-05-12 11:09:40 -04:00
ce6f2d1c4d
Merge remote-tracking branch 'arma/bug19003-try2' into maint-0.2.8
2016-05-12 11:09:33 -04:00
6294eb2846
Merge branch 'maint-0.2.8'
2016-05-12 10:03:26 -04:00
4a62d7aabc
minor touchups on nick's ticket 17621 changes
2016-05-11 16:35:36 -04:00
e3a4511049
Merge remote-tracking branch 'public/bug18815'
2016-05-11 14:12:39 -04:00
af4b7d0405
Document the contents of $datadir/keys
...
Ticket 17621.
2016-05-11 14:03:34 -04:00
48b7db3559
Add changes file for ticket 16698
2016-05-11 13:43:28 -04:00
cdb528d841
Fetch certificates from the same directory as previous certificates
...
Improves the fix to #18963 .
2016-05-11 13:30:30 -04:00
730cfeb6bd
Fetch certificates from the same directory as the consensus
...
Resolves ticket 18963; fix on #4483 in 0.2.8.1-alpha.
2016-05-11 13:30:08 -04:00
3c6f059e6a
Merge remote-tracking branch 'arma/feature18760'
2016-05-11 13:22:31 -04:00
e9e6a1f547
Merge branch 'maint-0.2.8'
2016-05-11 13:20:57 -04:00
8d962233f6
Merge remote-tracking branch 'teor/bug18816_simplify' into maint-0.2.8
2016-05-11 13:20:51 -04:00
022d32252a
Merge branch 'maint-0.2.8'
2016-05-11 13:17:02 -04:00
24fbb9a81b
Merge branch 'maint-0.2.7' into maint-0.2.8
2016-05-11 13:15:17 -04:00
4e94580591
Merge remote-tracking branch 'special/bug19032-027' into maint-0.2.7
2016-05-11 13:13:23 -04:00
bf3e32a452
Fix out-of-bounds write during voting with duplicate ed25519 keys
...
In dirserv_compute_performance_thresholds, we allocate arrays based
on the length of 'routers', a list of routerinfo_t, but loop over
the nodelist. The 'routers' list may be shorter when relays were
filtered by routers_make_ed_keys_unique, leading to an out-of-bounds
write on directory authorities.
This bug was originally introduced in 26e8974213a31e72
2016-05-11 13:11:03 -04:00
2cbad2aac7
Revert "Switch between fallback and authority when auth cert fetch fails"
...
This reverts commit 92d7ee08b8
2016-05-11 13:06:13 -04:00
71267bef4c
Merge branch 'maint-0.2.8'
2016-05-11 12:36:55 -04:00
28e1aa1118
Merge branch 'bug18761_028_squashed' into maint-0.2.8
2016-05-11 12:36:27 -04:00
b59d79134e
Log find_rp_for_intro_() failures at LOG_PROTOCOL_WARN.
...
Closes ticket 18761.
Also fix a whitespace issue.
2016-05-11 12:36:19 -04:00
79f9e63ebf
Merge branch 'maint-0.2.8'
2016-05-11 12:30:18 -04:00
Nick Mathewson
teor (Tim Wilson-Brown)
Roger Dingledine
John Brooks