4233fb7014
clarify in man page: we count by powers of two
...
Make clear in the man page, in both the bandwidth section and the
accountingmax section, that Tor counts in powers of two, not
powers of ten: 1 GByte is 1024*1024*1024 bytes, not one billion
bytes.
Resolves ticket 32106.
2019-10-23 07:50:20 +10:00
2ed194c9a9
Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.2
2019-10-22 14:46:10 -04:00
edc3f70635
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:54:43 -04:00
3c071f3002
Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.4.1
2019-10-22 12:54:37 -04:00
5ddc04f49d
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:53:12 -04:00
d08d29f15f
Merge remote-tracking branch 'tor-github/pr/1341' into maint-0.4.1
2019-10-22 12:53:06 -04:00
730f0e3da3
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:51:33 -04:00
b588b60876
Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.4.1
2019-10-22 12:51:27 -04:00
9537966a0b
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:15:14 -04:00
9769df89fe
Merge remote-tracking branch 'tor-github/pr/1303' into maint-0.4.1
2019-10-22 12:15:06 -04:00
c55c75bc97
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:13:55 -04:00
c1bf4260b6
Merge remote-tracking branch 'tor-github/pr/1302' into maint-0.4.1
2019-10-22 12:13:47 -04:00
34f3d8d407
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:11:59 -04:00
d4dde249a0
Merge remote-tracking branch 'tor-github/pr/1346' into maint-0.4.1
2019-10-22 12:11:50 -04:00
e5b9eefb02
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:10:30 -04:00
6965798a16
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-10-22 12:10:30 -04:00
4013e50cb7
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-22 12:10:30 -04:00
21c3488af7
Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5
2019-10-22 12:10:08 -04:00
cbc67241db
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:08:53 -04:00
4c8af10f0e
Merge remote-tracking branch 'tor-github/pr/1385' into maint-0.4.1
2019-10-22 12:08:46 -04:00
f98b59524c
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 20:48:20 +10:00
2318bb237f
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-10-22 20:48:13 +10:00
9bb0ca122f
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-22 20:48:05 +10:00
bed4390133
Merge remote-tracking branch 'origin/maint-0.3.5' into maint-0.3.5
2019-10-22 20:47:44 +10:00
8f84999f58
Merge branch 'ticket32177_041' into ticket32177_042
...
Merge RUST_VERSION from maint-0.4.2 into disabled macOS rust build
from ticket32177_041.
2019-10-22 19:44:58 +10:00
86b1714731
Merge branch 'ticket32177_040' into ticket32177_041
2019-10-22 19:43:38 +10:00
868bcc24e5
Merge branch 'ticket32177_035' into ticket32177_040
2019-10-22 19:43:33 +10:00
8e0190d837
Merge branch 'maint-0.3.5' into ticket32177_035
2019-10-22 19:43:18 +10:00
4c4a0d50ff
Travis: Disable the Rust macOS build
...
This build was added in 0.3.5.
We need to mitigate slow scheduling of Travis macOS jobs.
Closes ticket 32177.
2019-10-22 19:42:45 +10:00
92ad87b808
Merge branch 'ticket32177_029' into ticket32177_035
...
Stem from maint-0.3.5, disabled macOS chutney from ticket32177_029.
2019-10-22 19:42:23 +10:00
511aeba8ee
Travis: Disable all but one macOS build
...
We need to mitigate slow scheduling of Travis macOS jobs.
Closes ticket 32177.
2019-10-22 19:35:43 +10:00
53aa159632
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-10-21 18:44:44 -04:00
89ead08eef
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-21 18:44:44 -04:00
7a35c8d8be
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-21 18:44:44 -04:00
a7ccd9a997
respect accountingmax during soft hibernation
...
Relays now respect their AccountingMax bandwidth again. When relays
entered "soft" hibernation (which typically starts when we've hit
90% of our AccountingMax), we had stopped checking whether we should
enter hard hibernation. Soft hibernation refuses new connections and
new circuits, but the existing circuits can continue, meaning that
relays could have exceeded their configured AccountingMax.
This commit rolls back some of the cpu-saving fixes, where we tried
to avoid calling so many of our events while we're off the network.
That's because PERIODIC_EVENT_FLAG_NEED_NET checks net_is_disabled(),
which returns true even if we're only in soft hibernation.
Fixes bug 32108; bugfix on 0.4.0.1-alpha.
2019-10-21 04:14:42 -04:00
04e9e74f1d
Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.4.2
2019-10-21 13:07:39 +10:00
5dbdca0114
Merge remote-tracking branch 'tor-github/pr/1432' into maint-0.4.2
2019-10-21 09:45:18 +10:00
5c8ecf364a
Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.4.2
2019-10-21 09:44:42 +10:00
02e3e8eda5
hibernate: Fix repeated "bytes" in comment
2019-10-20 22:08:23 +10:00
f420b60c19
Appveyor: Use Windows Server 2019
...
Instead of Windows Server 2016.
Closes ticket 32086.
2019-10-20 22:04:08 +10:00
cf2b00d3f5
test/rebind: Make control formatting and log parsing more robust
...
* actually sleep when tor has not logged anything
* log at debug level when waiting for tor to log something
* backslash-replace bad UTF-8 characters in logs
* format control messages as ASCII: tor does not accept UTF-8 control commands
Fixes bug 31837; bugfix on 0.3.5.1-alpha.
2019-10-20 20:09:35 +10:00
0a5ce8280c
err: Use the correct type for cb_buf
...
Fixes bug 32060; bug not in any released version of tor.
Resolves CID 1454761.
2019-10-20 20:01:56 +10:00
8b4d7447ae
fix easy typos
2019-10-20 05:52:32 -04:00
f0f3f3338e
Merge remote-tracking branch 'tor-github/pr/1427' into maint-0.4.2
2019-10-18 12:42:49 -04:00
0994050c4a
Merge remote-tracking branch 'tor-github/pr/1426' into maint-0.4.2
2019-10-18 12:32:29 -04:00
57c4af16f0
Merge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.2
2019-10-18 12:27:39 -04:00
fbd2fef220
Merge branch 'maint-0.4.2' of git-rw.torproject.org:/tor into maint-0.4.2
2019-10-18 12:25:55 -04:00
b3fc3b609b
changes: file for 32124.
2019-10-18 17:26:09 +10:00
ac71ad662c
configure: Stop failing when jemalloc is requested, but tcmalloc is not found
...
Fixes bug 32124; bugfix on 0.3.5.1-alpha.
2019-10-18 17:18:52 +10:00
4442eef0b3
configure: Interpret --with-tcmalloc=no correctly
...
Fixes bug 32124; bugfix on 0.2.0.20-rc.
2019-10-18 17:16:32 +10:00
Roger Dingledine
Nick Mathewson
teor