Karsten Loesing
104e8fa751
Update geoip and geoip6 to the June 8 2017 database.
2017-06-09 15:47:49 +02:00
Nick Mathewson
875b1fbfba
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-06-08 14:06:28 -04:00
Nick Mathewson
6e90d75061
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-06-08 14:06:16 -04:00
Nick Mathewson
2f6be06f6a
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
...
"ours" merge to avoid version bump.
2017-06-08 14:06:06 -04:00
Nick Mathewson
eb92d11f53
Merge branch 'maint-0.2.5' into maint-0.2.6
...
"ours" merge to avoid version bump.
2017-06-08 14:05:59 -04:00
Nick Mathewson
1a7af7470f
Merge branch 'maint-0.2.4' into maint-0.2.5
...
"ours" merge to avoid version bump.
2017-06-08 14:05:37 -04:00
Nick Mathewson
5e554215dd
Add -dev to version number.
2017-06-08 14:05:27 -04:00
Nick Mathewson
5c47b92747
Add -dev to version number.
2017-06-08 14:05:22 -04:00
Nick Mathewson
44c8cb986d
Add -dev to version number.
2017-06-08 14:05:18 -04:00
Nick Mathewson
95a88f7283
Add -dev to version number.
2017-06-08 14:05:16 -04:00
Nick Mathewson
f3804f5999
Add -dev to version number.
2017-06-08 14:05:13 -04:00
Nick Mathewson
ec3ce773ad
Add -dev to version number.
2017-06-08 14:05:08 -04:00
Nick Mathewson
8239af0d9c
Merge branch 'maint-0.2.8' into maint-0.2.9
...
"ours" merge to avoid version bump.
2017-06-08 09:29:12 -04:00
Nick Mathewson
bff08ed8eb
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
...
"ours" merge to avoid version bump.
2017-06-08 09:29:05 -04:00
Nick Mathewson
4915d9c5a7
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
...
"ours" merge to avoid version bump.
2017-06-08 09:28:54 -04:00
Nick Mathewson
b796ad0300
Merge branch 'maint-0.2.5' into maint-0.2.6
...
"ours" merge to avoid version bump.
2017-06-08 09:28:29 -04:00
Nick Mathewson
77c5d8c738
Merge branch 'maint-0.2.4' into maint-0.2.5
...
"ours" merge to avoid version bump.
2017-06-08 09:28:11 -04:00
Nick Mathewson
792931d53d
Bump to 0.2.8.14
2017-06-08 09:27:54 -04:00
Nick Mathewson
2efe0275bc
Bump to 0.2.7.8
2017-06-08 09:27:34 -04:00
Nick Mathewson
0de4620375
Bump to 0.2.6.12
2017-06-08 09:26:20 -04:00
Nick Mathewson
fa73f59ad3
bump to 0.2.5.14
2017-06-08 09:26:00 -04:00
Nick Mathewson
8e439a66f3
Bump to 0.2.4.29
2017-06-08 09:25:31 -04:00
Nick Mathewson
b533220249
bump to 0.2.9.11
2017-06-08 09:24:38 -04:00
Nick Mathewson
d15d09a968
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-06-08 09:21:15 -04:00
Nick Mathewson
c1646d6e89
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-06-08 09:21:15 -04:00
Nick Mathewson
40bccc2004
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-06-08 09:21:15 -04:00
Nick Mathewson
dec7998f5c
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-06-08 09:21:15 -04:00
Nick Mathewson
987c7cae70
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-06-08 09:21:15 -04:00
David Goulet
56a7c5bc15
TROVE-2017-005: Fix assertion failure in connection_edge_process_relay_cell
...
On an hidden service rendezvous circuit, a BEGIN_DIR could be sent
(maliciously) which would trigger a tor_assert() because
connection_edge_process_relay_cell() thought that the circuit is an
or_circuit_t but is an origin circuit in reality.
Fixes #22494
Reported-by: Roger Dingledine <arma@torproject.org>
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-06-08 09:21:10 -04:00
Nick Mathewson
d561da10dd
Rename "link" variable to avoid shadowing warning.
2017-06-05 16:35:37 -04:00
Nick Mathewson
9fea00928c
Merge branch 'bug22460_case2_029_01_squashed' into maint-0.2.9
2017-06-05 15:28:13 -04:00
Nick Mathewson
ec84fc1d8e
Improve documentation on get_{peer,own}_certificate()
...
Make it clear that we're returning a newly allocated copy.
2017-06-05 15:27:33 -04:00
Nick Mathewson
01878fa309
Changes file for the x509 link certificate case of bug22460
2017-06-05 15:27:33 -04:00
Nick Mathewson
8e9392c267
Repair link_handshake unit tests to mock tor_tls_get_own_cert()
...
The tests previously assumed that the link handshake code would be
calling get_my_certs() -- when I changed it to call get_own_cert()
instead for the (case 2) 22460 fix, the tests failed, since the tls
connection wasn't really there.
This change makes us start mocking out the tor_tls_get_own_cert()
function too.
It also corrects the behavior of the mock_get_peer_cert() function
-- it should have been returning a newly allocated copy.
2017-06-05 15:27:33 -04:00
Nick Mathewson
39b7e89c28
Test prerequisites: function to dup a cert, make get_own_cert mockable.
2017-06-05 15:27:33 -04:00
Nick Mathewson
50facb40bb
On v3 link handshake, send the correct link certificate
...
Previously we'd send the _current_ link certificate, which would
cause a handshaking failure when the TLS context rotated.
2017-06-05 15:27:33 -04:00
Nick Mathewson
80aca1501a
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-06-05 14:49:46 -04:00
Nick Mathewson
d850d27369
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-06-05 14:48:30 -04:00
Nick Mathewson
9a6f938582
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-06-05 14:48:30 -04:00
Nick Mathewson
a56cfdaba2
Merge branch 'maint-0.2.5' into maint-0.2.6
...
Ours merge to avoid taking 4ee48cb434
2017-06-05 14:39:06 -04:00
Nick Mathewson
2e5220cb8b
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-06-05 14:38:54 -04:00
Nick Mathewson
4ee48cb434
Fix C89 warning (since Tor 0.2.4-5 still care about that.)
2017-06-05 14:38:38 -04:00
Nick Mathewson
d75be189df
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-06-05 12:02:15 -04:00
Nick Mathewson
33fcc0f61d
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-06-05 12:01:17 -04:00
Nick Mathewson
3f2d1f7f07
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-06-05 12:00:41 -04:00
Nick Mathewson
9ea3d0877a
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-06-05 12:00:27 -04:00
Nick Mathewson
1a540b5792
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-06-05 12:00:08 -04:00
Nick Mathewson
e3ebae4804
Fix undefined behavior in geoip_parse_entry().
...
Fixes bug 22490; bugfix on 6a241ff3ff
2017-06-05 10:09:39 -04:00
teor
ec61ae59a5
Stop leaking keypin-rejected routerinfos on directory authorities
...
When directory authorities reject a router descriptor due to keypinning,
free the router descriptor rather than leaking the memory.
Fixes bug 22370; bugfix on 0.2.7.2-alpha.
2017-05-25 00:09:40 -04:00
Roger Dingledine
6e5486b11a
dir auths reject 0.2.9.x for x<5, due to bug 20499
...
Directory authorities now reject relays running versions
0.2.9.1-alpha through 0.2.9.4-alpha, because those relays
suffer from bug 20499 and don't keep their consensus cache
up-to-date.
Resolves ticket 20509.
2017-05-22 08:31:39 -04:00
