2e590bac97
Remove changes files that have already been merged in 0.3.2.x
2017-11-18 11:23:41 -05:00
b9bce4288e
Merge branch 'maint-0.3.2'
2017-11-18 10:23:52 -05:00
a5b8b55c1c
Fix memory leak in unit test for bridge distribution config.
...
Also, check for the actual message, and fix some string confusion,
while we're at it.
Fixes bug 24345; bugfix on 0.3.2.3-alpha.
2017-11-18 10:22:14 -05:00
fcdec00685
Merge branch 'maint-0.3.2'
2017-11-17 09:59:26 -05:00
2cee26b164
Merge branch 'bug23817_031' into maint-0.3.2
2017-11-17 09:56:53 -05:00
f61e3090fb
Introduce new guard restriction and use it to skip outdated dirs.
2017-11-17 09:52:40 -05:00
94dce246ee
Merge branch 'maint-0.3.2'
2017-11-17 09:26:11 -05:00
b98614f1af
Only log about lost KIST support once
2017-11-17 09:25:47 -05:00
8b2c01a46f
Use less jargon in Scheduler sec. of man page
2017-11-17 09:25:07 -05:00
3537f7801d
Add notes about OS support for our scheduler types
2017-11-17 09:25:01 -05:00
cfacd44240
Merge branch 'maint-0.3.2'
2017-11-17 09:23:07 -05:00
85778dc92d
Merge remote-tracking branch 'dgoulet/bug23861_032_01' into maint-0.3.2
2017-11-17 09:23:04 -05:00
368dc1003e
Merge branch 'maint-0.3.2'
2017-11-17 08:35:56 -05:00
3a364309ac
Merge branch 'bug24167_025' into maint-0.3.2
2017-11-17 08:35:52 -05:00
4ef70ff389
Merge branch 'maint-0.3.2'
2017-11-17 08:35:04 -05:00
0571015819
Merge branch 'ticket24097_032' into maint-0.3.2
2017-11-17 08:35:01 -05:00
4b56df9874
Merge branch 'maint-0.3.2'
2017-11-17 08:34:23 -05:00
0684e6c6f0
Merge branch 'bug20963_032' into maint-0.3.2
2017-11-17 08:34:05 -05:00
95238eb917
Fix a traceback when closing a blocked connection "immediately".
...
When we close a connection via connection_close_immediately, we kill
its events immediately. But if it had been blocked on bandwidth
read/write, we could try to re-add its (nonexistent) events later
from connection_bucket_refill -- if we got to that callback before
we swept the marked connections.
Fixes bug 24167. Fortunately, this hasn't been a crash bug since we
introduced connection_check_event in 0.2.9.10, and backported it.
This is a bugfix on commit 89d422914a
2017-11-16 12:05:56 -05:00
380a95116a
relay: Avoid extra LOG_NOTICE for every new descriptor batch
...
Commit 56c5e282a7Fixes #23861
Signed-off-by: David Goulet <dgoulet@torproject.org >
2017-11-16 10:57:05 -05:00
2a98fcb848
Downgrade evdns warnings about weird replies.
...
evdns is allowed to give us unrecognized object types; it is allowed
to give us non-IPv4 answer types, and it is (even) allowed to give
us empty answers without an error.
Closes ticket 24097.
2017-11-16 09:30:19 -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
ef55a7a69a
Tweak the message when we re-enable CBT.
...
Implements ticket 20963.
2017-11-15 14:42:59 -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
1d5e693b63
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-13 20:36:04 -05: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
Nick Mathewson
George Kadianakis
Matt Traudt
David Goulet