Nick Mathewson
2367b1ed31
Merge branch 'maint-0.3.2' into release-0.3.2
2017-11-15 15:11:30 -05:00
Nick Mathewson
56b7407a90
Merge branch 'bug24279_030' into maint-0.3.2
2017-11-15 15:11:26 -05:00
Nick Mathewson
7548805850
whoops; add missing credit.
2017-11-15 15:11:15 -05:00
Nick Mathewson
67c62394bc
Merge branch 'bug24279_030' into maint-0.3.2
2017-11-15 15:09:33 -05:00
Nick Mathewson
f28559fd2a
Changes file for 24279.
2017-11-15 15:09:11 -05:00
Nick Mathewson
01c5d4583f
Merge branch 'maint-0.3.2' into release-0.3.2
2017-11-15 14:25:25 -05:00
Nick Mathewson
ae8683621a
Merge remote-tracking branch 'asn/bug23662_032' into maint-0.3.2
2017-11-15 14:25:20 -05:00
Nick Mathewson
7d1e47559a
Merge branch 'maint-0.3.2' into release-0.3.2
2017-11-14 14:45:11 -05:00
Nick Mathewson
6dc784bdb3
Merge remote-tracking branch 'dgoulet/bug24230_032_01' into maint-0.3.2
2017-11-14 14:45:07 -05:00
George Kadianakis
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
Nick Mathewson
50fbede459
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-13 20:36:04 -05:00
Nick Mathewson
1b9bb2c847
Merge branch 'bug22895_027' into maint-0.2.9
2017-11-13 20:35:59 -05:00
Nick Mathewson
8473424ede
Merge branch 'maint-0.3.2' into release-0.3.2
2017-11-13 16:58:21 -05:00
Nick Mathewson
985c41b500
add a missing subcategory to 23637, again
2017-11-13 16:58:11 -05:00
Nick Mathewson
fea5c8a015
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-13 12:57:58 -05:00
Nick Mathewson
543fd89fb7
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-13 12:57:58 -05:00
Nick Mathewson
800797e7f3
Merge branch 'bug23291_028' into maint-0.2.8
2017-11-13 12:57:55 -05:00
Nick Mathewson
08d933a794
Merge branch 'maint-0.3.2' into release-0.3.2
2017-11-13 12:27:44 -05:00
Nick Mathewson
d0b75b5ade
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-11-13 12:27:36 -05:00
David Goulet
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
Nick Mathewson
a71552268d
Merge branch 'maint-0.3.2' into release-0.3.2
2017-11-13 11:20:23 -05:00
Nick Mathewson
3300a6e93a
Merge remote-tracking branch 'arma/ticket23637' into maint-0.3.2
2017-11-13 11:20:20 -05:00
Nick Mathewson
5ea9a48ae7
Merge branch 'maint-0.3.2' into release-0.3.2
2017-11-13 11:19:12 -05:00
Nick Mathewson
16bdb9e365
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-13 11:18:02 -05:00
Nick Mathewson
91188540af
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-13 11:18:02 -05:00
Nick Mathewson
ab415ae950
Merge remote-tracking branch 'teor/bug23470-029' into maint-0.2.9
2017-11-13 11:17:58 -05:00
Nick Mathewson
9092e9019a
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-13 11:15:50 -05:00
Nick Mathewson
666653758d
Merge branch 'bug8185_025' into maint-0.2.9
2017-11-13 11:15:47 -05:00
Nick Mathewson
0fc2b7f82e
Merge branch 'bug8185_031' into maint-0.3.1
2017-11-13 11:15:40 -05:00
Nick Mathewson
ece63105d9
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-13 11:13:22 -05:00
Nick Mathewson
c928fb988a
Merge branch 'ticket21953_029' into maint-0.2.9
2017-11-13 11:13:18 -05:00
Nick Mathewson
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
Nick Mathewson
55aafbf7ba
Merge branch 'maint-0.3.2' into release-0.3.2
2017-11-11 12:23:34 -05:00
Nick Mathewson
ef92511577
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-11 12:23:34 -05:00
Nick Mathewson
512dfa15ed
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-11-11 12:23:34 -05:00
Nick Mathewson
c9b76a12f5
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-11-11 12:23:33 -05:00
Nick Mathewson
5348c8996f
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-11 12:23:33 -05:00
Nick Mathewson
9666c620d5
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-11 12:23:33 -05:00
David Goulet
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
Karsten Loesing
6f8c32b7de
Update geoip and geoip6 to the November 6 2017 database.
2017-11-10 10:14:09 +01:00
Nick Mathewson
6a8c1667df
Merge branch 'maint-0.3.2' into release-0.3.2
2017-11-09 08:17:46 -05:00
Nick Mathewson
aa1d90b40c
Merge branch 'bug23985_029' into maint-0.3.2
2017-11-09 08:15:46 -05:00
Nick Mathewson
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
d37bc72873
fold new entries into changelog
2017-11-08 11:05:03 -05:00
Nick Mathewson
04714df9cc
Merge branch 'maint-0.3.2' into release-0.3.2
2017-11-08 11:02:51 -05:00
Nick Mathewson
02f05f2de2
Merge remote-tracking branch 'dgoulet/bug23751_032_01' into maint-0.3.2
2017-11-08 10:56:33 -05:00
Nick Mathewson
c74a817e83
Merge branch 'bug23318-redux_029' into maint-0.3.2
2017-11-08 10:47:22 -05:00
teor
fcaa4ab824
Actually log the total bandwidth in compute_weighted_bandwidths()
...
Fixes bug 24170; bugfix on 0.2.4.3-alpha.
2017-11-08 10:45:18 -05:00
teor
14b0bba06e
Use node counts in networks with all zero-bandwidths
...
When calculating the fraction of nodes that have descriptors, and all
all nodes in the network have zero bandwidths, count the number of nodes
instead.
Fixes bug 23318; bugfix on 0.2.4.10-alpha.
2017-11-08 10:45:18 -05:00
Nick Mathewson
3c03e237ab
Remove an erroneous 0.5 in compute_weighted_bandwidths()
...
Back in 0.2.4.3-alpha (e106812a77
2017-11-08 10:45:18 -05:00
