Daniel Pinto
60c436d14d
Attempt to fix test_include.py on TravisCI #25140
2020-08-12 14:35:51 +01:00
Nick Mathewson
06c31b1b79
Remove changes files that have also appeared in 0.4.4 releases.
2020-08-12 08:51:43 -04:00
Nick Mathewson
db10d00199
Merge branch 'maint-0.4.4'
2020-08-12 08:40:27 -04:00
Nick Mathewson
670f5632a5
Merge branch 'maint-0.4.3' into maint-0.4.4
...
"ours" merge to avoid MR 122 -- we already merged MR 123.
2020-08-12 08:40:10 -04:00
Nick Mathewson
489d33e190
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-08-12 08:39:41 -04:00
Nick Mathewson
6ef40144ae
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-08-12 08:39:41 -04:00
George Kadianakis
537be1da33
CI: Remove VS2015 AppVeyor build
2020-08-12 14:09:32 +03:00
George Kadianakis
8182f1351a
CI: Remove VS2015 AppVeyor build.
2020-08-12 14:05:21 +03:00
George Kadianakis
347f87ae9d
Merge branch 'maint-0.4.4'
2020-08-12 13:47:59 +03:00
George Kadianakis
5a1918d7e7
Merge remote-tracking branch 'tor-gitlab/mr/107' into maint-0.4.4
2020-08-12 13:47:34 +03:00
George Kadianakis
c591a0d246
Merge branch 'maint-0.4.4'
2020-08-12 13:23:33 +03:00
George Kadianakis
8e9edb93be
Merge remote-tracking branch 'tor-gitlab/mr/104' into maint-0.4.4
2020-08-12 13:23:08 +03:00
Nick Mathewson
2f708079cd
Use correct URL for CoreTorReleases in README.
...
Closes #40085
2020-08-11 18:43:33 -04:00
Nick Mathewson
4fdec27a12
Remove extraneous EVENT_CONTROLLER_WAIT
...
This turned into a new StreamStatus value.
Closes #40092 . Bug not in any released Tor.
2020-08-11 18:41:15 -04:00
Nick Mathewson
b56985f022
CodingStandards.md: allow "bugfix on all supported versions.
...
Closes tpo/core/team#1 .
2020-08-11 17:58:11 -04:00
Nick Mathewson
ea0a704d52
Merge branch 'maint-0.4.4'
...
"ours" merge to avoid version bump.
2020-08-11 17:47:02 -04:00
Nick Mathewson
1770d1c216
bump version to 0.4.4.4-rc
2020-08-11 17:46:44 -04:00
Nick Mathewson
a02002dc99
Lower the minimum value for MaxMemInQueues to 64 MB for relays.
...
For clients, there is no minimum value; in both cases, we warn if
the value seems too low.
Closes ticket 24308.
2020-08-11 17:01:49 -04:00
Daniel Pinto
0b633b1f6d
Improved documentation and comments #25140
2020-08-11 18:26:41 +01:00
Nick Mathewson
431dcc42e0
Rename argument to compute_real_max_mem_in_queues()
2020-08-11 12:59:07 -04:00
Nick Mathewson
e93ff481f9
Merge branch 'maint-0.4.4'
2020-08-11 12:40:09 -04:00
Nick Mathewson
d76f8457f3
Merge remote-tracking branch 'tor-gitlab/mr/119' into maint-0.4.4
2020-08-11 12:40:02 -04:00
Nick Mathewson
11961f0bc5
Merge remote-tracking branch 'tor-gitlab/mr/119'
2020-08-11 12:39:30 -04:00
Nick Mathewson
0ec2d1528c
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-08-11 12:37:08 -04:00
Nick Mathewson
c6c0af403c
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-08-11 12:37:08 -04:00
Nick Mathewson
2b968446d9
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-08-11 12:37:08 -04:00
Nick Mathewson
da9684d89a
Merge branch 'maint-0.4.4'
2020-08-11 12:37:08 -04:00
Nick Mathewson
adb7268236
CI: label our python versions.
2020-08-11 12:24:03 -04:00
Nick Mathewson
9eb316de42
CI: Only run doxygen on 0.4.3 and later.
2020-08-11 12:22:35 -04:00
Nick Mathewson
6a91a50d32
CI: enable documentation testing
2020-08-11 11:06:49 -04:00
Nick Mathewson
e4ef3c61f7
Merge branch 'maint-0.4.4'
2020-08-11 11:03:25 -04:00
Nick Mathewson
6bee9bd481
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-08-11 11:03:24 -04:00
Nick Mathewson
da8577bb75
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-08-11 11:03:24 -04:00
Nick Mathewson
673d02bdb0
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-08-11 11:03:24 -04:00
Nick Mathewson
aa2c93b90b
Fix a pair of typos in ci-driver.sh.
2020-08-11 11:03:11 -04:00
Nick Mathewson
2a7e71c956
Fix "run_check_subsystem_order.sh" to use $PYTHON.
...
Previously it just used /usr/bin/env/python, which would fail if we
only had a "python3" binary.
Fixes bug 40095; bugfix on 0.4.4.1-alpha.
2020-08-11 11:01:31 -04:00
Nick Mathewson
0ee3b83a0b
Merge branch 'maint-0.4.4'
2020-08-11 10:44:40 -04:00
Nick Mathewson
262ddfee7a
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-08-11 10:44:40 -04:00
Nick Mathewson
e4a6d9d5a9
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-08-11 10:44:40 -04:00
Nick Mathewson
d83703317d
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-08-11 10:44:40 -04:00
Nick Mathewson
8a0f530adf
Add a pair of warnings about only editing CI in 035
2020-08-11 10:44:32 -04:00
George Kadianakis
b705cfa024
Merge remote-tracking branch 'tor-gitlab/mr/111'
2020-08-11 15:12:43 +03:00
George Kadianakis
b46942d37f
Merge remote-tracking branch 'tor-gitlab/mr/109'
2020-08-11 15:09:12 +03:00
George Kadianakis
f971a8fbad
Merge branch 'mr/105'
2020-08-11 15:04:15 +03:00
Nick Mathewson
7df52b71bf
Only log port self-testing message when we are _starting_ to test.
...
(Unlike approaches in earlier versions of Tor, this one logs if and
only if we are launching a test, and we haven't said that we're
testing this port.)
Fixes bug 40068; bug not in any released version.
Closes #40068 .
2020-08-11 15:02:44 +03:00
George Kadianakis
b8003fbe99
Merge branch 'maint-0.4.4'
2020-08-11 14:54:26 +03:00
George Kadianakis
ab9c35f043
Merge remote-tracking branch 'tor-gitlab/mr/102' into maint-0.4.4
2020-08-11 14:53:03 +03:00
George Kadianakis
9316ca9f06
Remove a BUG() that could normally trigger in edge-cases.
2020-08-11 14:42:18 +03:00
Nick Mathewson
069946852a
Merge branch 'maint-0.4.4'
2020-08-10 19:33:07 -04:00
Nick Mathewson
7d80bf80fe
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-08-10 19:33:07 -04:00
