20606b8a15
Merge remote-tracking branch 'tor-github/pr/1447'
2019-10-24 10:00:47 +10:00
9586ae178a
Merge branch 'tor-github/pr/1451'
2019-10-23 09:11:43 -04:00
34509e78c6
Merge remote-tracking branch 'tor-github/pr/1449'
2019-10-23 22:59:16 +10:00
226f11002d
changes: file for 32216
2019-10-23 13:36:39 +10:00
d804a81cf1
changes: file for 29603
...
We merged this change without a changes file.
2019-10-23 12:26:32 +10:00
9db1602ec5
Merge branch 'maint-0.4.2'
2019-10-23 08:47:30 +10:00
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
1cdc030c3d
Merge branch 'maint-0.4.2'
2019-10-22 14:47:28 -04:00
2ed194c9a9
Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.2
2019-10-22 14:46:10 -04:00
04addabb04
Changes file for options_validate() API changes in #32187 .
2019-10-22 14:24:09 -04:00
91413e04b4
Remove changes files that are already merged in 0.4.2.
2019-10-22 13:01:25 -04:00
7d75e1dbdf
Merge remote-tracking branch 'tor-github/pr/1446'
2019-10-22 12:52:32 -04:00
b2d487ae22
Merge branch 'ticket31705_v2' into ticket31705_v2_merged
...
Conflicts:
src/feature/dirparse/authcert_parse.c
src/feature/dirparse/ns_parse.c
src/feature/hs/hs_service.c
src/lib/conf/conftesting.h
src/lib/log/log.h
src/lib/thread/threads.h
src/test/test_options.c
These conflicts were mostly related to autostyle improvements, with
one or two due to doxygen fixes.
2019-10-22 09:39:06 -04:00
2d013bbe5c
Merge remote-tracking branch 'tor-github/pr/1417'
2019-10-22 08:36:32 -04:00
8d84e10e87
Make options_validate() no longer use its "defaults" argument.
...
It can just look at what the defaults are.
Closes ticket 32185.
2019-10-22 08:30:00 -04:00
a1d5341374
Merge branch 'bug32175'
2019-10-22 07:51:30 -04:00
65e80ce646
Merge branch 'from_setconf_removal_squashed'
2019-10-22 07:50:42 -04:00
0bb2e77283
changes file for 31999
2019-10-22 07:50:13 -04:00
b3478a8856
Merge branch 'maint-0.4.2'
2019-10-22 20:48:26 +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
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
7a35c8d8be
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-21 18:44:44 -04: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
65c0df4dbf
Merge branch 'maint-0.4.2'
2019-10-21 18:44:44 -04:00
b064e0420a
Changes file for 32175 (test_options.c cleanup)
2019-10-21 14:46:04 -04:00
7dc78aca29
Merge remote-tracking branch 'tor-github/pr/1430'
2019-10-21 12:43:26 -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
7a72e71f74
Merge remote-tracking branch 'tor-github/pr/1434'
2019-10-21 15:24:22 +10:00
3b2525c375
Fix changes file and string typos
...
Part of 31684.
2019-10-21 13:56:58 +10:00
6413b2102f
control: Add GETINFO support for dumping microdesc consensus
...
- Allows control port to read microdesc consensus using:
GETINFO dir/status-vote/microdesc/consensus
add: Helper function `getinfo_helper_current_consensus`
test: check if GETINFO commands return expected consensus data.
Resolves 31684.
2019-10-21 13:54:55 +10:00
77c85360f6
Merge branch 'maint-0.4.2'
2019-10-21 13:28:04 +10:00
04e9e74f1d
Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.4.2
2019-10-21 13:07:39 +10:00
a1f73cb93d
Merge branch 'maint-0.4.2'
2019-10-21 09:45:34 +10:00
5c8ecf364a
Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.4.2
2019-10-21 09:44:42 +10:00
f420b60c19
Appveyor: Use Windows Server 2019
...
Instead of Windows Server 2016.
Closes ticket 32086.
2019-10-20 22:04:08 +10:00
b1f71eeed6
changes: file for 32123
...
Create an optional relay module, which can be disabled using the
--disable-module-relay configure option. When it is set, also disable
the dirauth module.
Add a minimal implemention, which disables the relay and dircache modes
in tor.
Closes ticket 32123.
2019-10-20 20:26:09 +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
37320bce06
Merge branch 'maint-0.4.2'
2019-10-18 12:42:56 -04:00
f0f3f3338e
Merge remote-tracking branch 'tor-github/pr/1427' into maint-0.4.2
2019-10-18 12:42:49 -04:00
264c5312eb
Merge branch 'maint-0.4.2'
2019-10-18 12:32: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
7c5716d162
Merge branch 'maint-0.4.2'
2019-10-18 12:27:49 -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
teor
David Goulet
Roger Dingledine
Nick Mathewson
AmreshVenugopal