93dbce4ddd
Log a better message if a router we're re-adding is expired.
...
Addresses ticket 20020.
2017-11-16 08:35:06 -05:00
8ff60b5288
Merge branch 'maint-0.3.2'
2017-11-15 15:11:30 -05:00
56b7407a90
Merge branch 'bug24279_030' into maint-0.3.2
2017-11-15 15:11:26 -05:00
7548805850
whoops; add missing credit.
2017-11-15 15:11:15 -05:00
67c62394bc
Merge branch 'bug24279_030' into maint-0.3.2
2017-11-15 15:09:33 -05:00
f28559fd2a
Changes file for 24279.
2017-11-15 15:09:11 -05:00
ceeacc734d
Merge branch 'maint-0.3.2'
2017-11-15 14:25:25 -05:00
ae8683621a
Merge remote-tracking branch 'asn/bug23662_032' into maint-0.3.2
2017-11-15 14:25:20 -05:00
702a13c9d3
Merge branch 'maint-0.3.2'
2017-11-14 14:45:11 -05:00
6dc784bdb3
Merge remote-tracking branch 'dgoulet/bug24230_032_01' into maint-0.3.2
2017-11-14 14:45:07 -05:00
c4a56ed5c2
Silence a warning about failed descriptor uploads.
...
Due to #23662 this can happen under natural causes and does not disturb
the functionality of the service. This is a simple 0.3.2 fix for now,
and we plan to fix this properly in 0.3.3.
2017-11-14 17:16:33 +02:00
50fbede459
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-13 20:36:04 -05:00
1b9bb2c847
Merge branch 'bug22895_027' into maint-0.2.9
2017-11-13 20:35:59 -05:00
985c41b500
add a missing subcategory to 23637, again
2017-11-13 16:58:11 -05:00
fea5c8a015
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-13 12:57:58 -05:00
543fd89fb7
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-13 12:57:58 -05:00
800797e7f3
Merge branch 'bug23291_028' into maint-0.2.8
2017-11-13 12:57:55 -05:00
0c6d05cdd4
Merge branch 'maint-0.3.2'
2017-11-13 12:27:44 -05:00
d0b75b5ade
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-11-13 12:27:36 -05:00
7df28ce299
hs-v3: Fix consensus param "hsdir-interval" name
...
The dir-spec.txt specifies it to be "hsdir_interval" (underscore).
Fixes #24262
Signed-off-by: David Goulet <dgoulet@torproject.org >
2017-11-13 11:48:56 -05:00
527eb563cb
Remove changes files for those items already merged in 0.3.2
2017-11-13 11:45:55 -05:00
0b4e59b7c6
Merge remote-tracking branch 'sebastian/bug24137'
2017-11-13 11:32:35 -05:00
3300a6e93a
Merge remote-tracking branch 'arma/ticket23637' into maint-0.3.2
2017-11-13 11:20:20 -05:00
16bdb9e365
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-13 11:18:02 -05:00
91188540af
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-13 11:18:02 -05:00
ab415ae950
Merge remote-tracking branch 'teor/bug23470-029' into maint-0.2.9
2017-11-13 11:17:58 -05:00
9092e9019a
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-13 11:15:50 -05:00
666653758d
Merge branch 'bug8185_025' into maint-0.2.9
2017-11-13 11:15:47 -05:00
0fc2b7f82e
Merge branch 'bug8185_031' into maint-0.3.1
2017-11-13 11:15:40 -05:00
ece63105d9
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-13 11:13:22 -05:00
c928fb988a
Merge branch 'ticket21953_029' into maint-0.2.9
2017-11-13 11:13:18 -05:00
f92736517b
Merge branch 'bug23577_squashed'
2017-11-12 17:05:39 -05:00
fb718e9912
Make setup_introduce1_data() take a node_t instead of an extend_info_t
...
Clients add rendezvous point IPv6 addresses to introduce cell link specifiers,
when the node has a valid IPv6 address.
Also check the node's IPv4 address is valid before adding any link specifiers.
Implements #23577 .
2017-11-12 17:05:25 -05:00
11eaf208c0
Merge branch 'bug24247_032'
2017-11-11 14:46:33 -05:00
a7ca71cf6b
Fix mock_crypto_pk_public_checksig__nocheck() to handle short RSA keys
...
This function -- a mock replacement used only for fuzzing -- would
have a buffer overflow if it got an RSA key whose modulus was under
20 bytes long.
Fortunately, Tor itself does not appear to have a bug here.
Fixes bug 24247; bugfix on 0.3.0.3-alpha when fuzzing was
introduced. Found by OSS-Fuzz; this is OSS-Fuzz issue 4177.
2017-11-11 14:44:45 -05:00
ef92511577
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-11 12:23:34 -05:00
512dfa15ed
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-11-11 12:23:34 -05:00
f8707e4f6c
Merge branch 'maint-0.3.2'
2017-11-11 12:23:34 -05:00
c9b76a12f5
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-11-11 12:23:33 -05:00
5348c8996f
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-11 12:23:33 -05:00
9666c620d5
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-11 12:23:33 -05:00
42ce6f78c8
control: Fix wrong Action on failure to upload an HS descriptor
...
On failure to upload, the HS_DESC event would report "UPLOAD_FAILED" as the
Action but it should have reported "FAILED" according to the spec.
Fixes #24230
Signed-off-by: David Goulet <dgoulet@torproject.org >
2017-11-10 15:31:31 -05:00
6f8c32b7de
Update geoip and geoip6 to the November 6 2017 database.
2017-11-10 10:14:09 +01:00
aa9688a4ad
missing subcategory
2017-11-09 09:23:12 -05:00
552218437c
Merge branch 'ticket12062_squashed'
2017-11-09 09:20:55 -05:00
0c6eabf088
Audit all of the "is the network turned off" checks.
...
DisableNetwork is a subset of net_is_disabled(), which is (now) a
subset of should_delay_dir_fetches().
Some of these changes are redundant with others higher or lower in
the call stack. The ones that I think are behavior-relevant are
listed in the changes file. I've also added comments in a few
places where the behavior is subtle.
Fixes bug 12062; bugfix on various versions.
2017-11-09 09:19:42 -05:00
0626031564
Merge branch 'ticket20895'
2017-11-09 09:17:53 -05:00
59c1016aba
Merge branch 'maint-0.3.2'
2017-11-09 08:17:46 -05:00
aa1d90b40c
Merge branch 'bug23985_029' into maint-0.3.2
2017-11-09 08:15:46 -05:00
0dc55fb247
Don't delay descriptor fetches when missing info needed for circuits
...
When we have fewer than 15 descriptors to fetch, we will delay the
fetch for a little while. That's fine, if we can go ahead and build
circuits... but if not, it's a poor choice indeed.
Fixes bug 23985; bugfix on 0.1.1.11-alpha.
In 0.3.0.3-alpha, when we made primary guard descriptors necessary
for circuit building, this situation got worse.
2017-11-08 13:22:16 -05:00
Nick Mathewson
George Kadianakis
David Goulet
Neel Chauhan
Karsten Loesing