teor
d175e70817
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-10-23 08:47:01 +10:00
teor
641f130447
Merge remote-tracking branch 'tor-github/pr/1361' into maint-0.4.0
2019-10-23 08:35:17 +10:00
teor
c77162e4e9
Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5
2019-10-23 08:32:52 +10:00
teor
8682442c76
Merge remote-tracking branch 'tor-github/pr/1351' into maint-0.2.9
2019-10-23 08:32:22 +10:00
teor
27965f1ef2
Merge remote-tracking branch 'tor-github/pr/1284' into maint-0.3.5
2019-10-23 08:30:48 +10:00
teor
003be727c4
Merge remote-tracking branch 'tor-github/pr/1256' into maint-0.3.5
2019-10-23 08:28:03 +10:00
teor
1ea19d7a5b
Merge branch 'maint-0.2.9' into maint-0.3.5
...
`git merge --strategy ours` to take the 0.3.5 changes for 31001,
and ignore the conflicting 0.2.9 changes.
2019-10-23 08:25:42 +10:00
teor
7660a7cf7d
Merge remote-tracking branch 'tor-github/pr/1178' into maint-0.2.9
2019-10-23 08:20:45 +10:00
Philipp Winter
80a198928e
Remove outdated note.
...
BridgeDB supports bridge-distribution lines since version 0.5.0:
<https://bugs.torproject.org/23957 >
2019-10-23 07:52:05 +10:00
Roger Dingledine
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
teor
339c18d6c7
Tidy whitespace around some STMT_BEGINs and STMT_ENDs
2019-10-23 07:37:39 +10:00
Nick Mathewson
1cdc030c3d
Merge branch 'maint-0.4.2'
2019-10-22 14:47:28 -04:00
Nick Mathewson
2ed194c9a9
Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.2
2019-10-22 14:46:10 -04:00
Nick Mathewson
04addabb04
Changes file for options_validate() API changes in #32187 .
2019-10-22 14:24:09 -04:00
Nick Mathewson
6bc2b41e54
config validation: make the "old_options" argument const.
...
We can't do this with the "options" argument yet, since several
places in the code change those right now.
2019-10-22 14:24:09 -04:00
Nick Mathewson
3656fdae98
test_options: remove def_opt member of test data.
2019-10-22 14:24:09 -04:00
Nick Mathewson
86a1d670ac
test_options: remove "dflt" part of setup_options().
...
It is no longer used anywhere.
2019-10-22 14:24:09 -04:00
Nick Mathewson
475a1dc9be
Remove a pair of now-unused default-options arguments.
2019-10-22 14:24:03 -04:00
Nick Mathewson
3dc0944acd
test_options: Fix options_validate() calls in macros.
...
Coccinelle missed these.
2019-10-22 14:24:03 -04:00
Nick Mathewson
41e6e2f496
Use coccinelle to fix most options_validate() call sites.
...
There was one that it could not find because it was in a macro definition.
I used the following semantic patch:
@@
expression e1, e2, e3, e4, e5;
@@
options_validate(e1,
e2,
- e3,
- e4,
e5)
2019-10-22 14:01:42 -04:00
Nick Mathewson
8a27023d21
Remove unused arguments from options_validate().
...
This change breaks compilation; a subsequent commit will fix it with
a coccinelle patch.
2019-10-22 13:56:11 -04:00
Nick Mathewson
697d99e504
validate_fn(): remove now-unused defaults and from_setconf.
...
These arguments were only used by options_validate, and are now
ignored even there.
2019-10-22 13:52:40 -04:00
Nick Mathewson
91413e04b4
Remove changes files that are already merged in 0.4.2.
2019-10-22 13:01:25 -04:00
Nick Mathewson
de24a7f992
Merge branch 'maint-0.4.2'
2019-10-22 12:54:44 -04:00
Nick Mathewson
edc3f70635
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:54:43 -04:00
Nick Mathewson
3c071f3002
Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.4.1
2019-10-22 12:54:37 -04:00
Nick Mathewson
7c88fcf4e2
Merge branch 'maint-0.4.2'
2019-10-22 12:53:12 -04:00
Nick Mathewson
5ddc04f49d
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:53:12 -04:00
Nick Mathewson
d08d29f15f
Merge remote-tracking branch 'tor-github/pr/1341' into maint-0.4.1
2019-10-22 12:53:06 -04:00
Nick Mathewson
7d75e1dbdf
Merge remote-tracking branch 'tor-github/pr/1446'
2019-10-22 12:52:32 -04:00
Nick Mathewson
730f0e3da3
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:51:33 -04:00
Nick Mathewson
3989dd1616
Merge branch 'maint-0.4.2'
2019-10-22 12:51:33 -04:00
Nick Mathewson
b588b60876
Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.4.1
2019-10-22 12:51:27 -04:00
Nick Mathewson
9537966a0b
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:15:14 -04:00
Nick Mathewson
4d43e1bf4f
Merge branch 'maint-0.4.2'
2019-10-22 12:15:14 -04:00
Nick Mathewson
9769df89fe
Merge remote-tracking branch 'tor-github/pr/1303' into maint-0.4.1
2019-10-22 12:15:06 -04:00
Nick Mathewson
f58439ee55
Merge branch 'maint-0.4.2'
2019-10-22 12:13:56 -04:00
Nick Mathewson
c55c75bc97
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:13:55 -04:00
Nick Mathewson
c1bf4260b6
Merge remote-tracking branch 'tor-github/pr/1302' into maint-0.4.1
2019-10-22 12:13:47 -04:00
Nick Mathewson
3939bb82f0
Merge branch 'maint-0.4.2'
2019-10-22 12:11:59 -04:00
Nick Mathewson
34f3d8d407
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:11:59 -04:00
Nick Mathewson
d4dde249a0
Merge remote-tracking branch 'tor-github/pr/1346' into maint-0.4.1
2019-10-22 12:11:50 -04:00
Nick Mathewson
4013e50cb7
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-22 12:10:30 -04:00
Nick Mathewson
da59dee5d4
Merge branch 'maint-0.4.2'
2019-10-22 12:10:30 -04:00
Nick Mathewson
e5b9eefb02
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:10:30 -04:00
Nick Mathewson
6965798a16
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-10-22 12:10:30 -04:00
Nick Mathewson
21c3488af7
Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5
2019-10-22 12:10:08 -04:00
Nick Mathewson
8d7015eb8b
Merge branch 'maint-0.4.2'
2019-10-22 12:08:53 -04:00
Nick Mathewson
cbc67241db
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:08:53 -04:00
Nick Mathewson
4c8af10f0e
Merge remote-tracking branch 'tor-github/pr/1385' into maint-0.4.1
2019-10-22 12:08:46 -04:00
