Nick Mathewson
8d908b961f
Merge branch 'maint-0.3.2'
2017-10-24 19:37:11 -04:00
Nick Mathewson
8cc57bccfe
Isis has been noticing typos.
2017-10-24 19:37:09 -04:00
Nick Mathewson
b95ef19a77
Merge branch 'feature18329_029_squashed' into maint-0.3.2
2017-10-24 19:35:32 -04:00
Nick Mathewson
594cf92498
Merge branch 'feature18329_029_squashed' into maint-0.3.2
2017-10-24 19:35:28 -04:00
Nick Mathewson
f3af74ccf5
Updates to fix check-spaces/check-changes warnings
2017-10-24 19:35:16 -04:00
Nick Mathewson
44e8aaa9aa
Adjust test to allow hyphens too.
2017-10-24 19:33:38 -04:00
Isis Lovecruft
02cde0d939
test: Add unittest for descriptors with BridgeDistribution option.
2017-10-24 19:26:24 -04:00
Isis Lovecruft
b0e10f23ba
doc: Improve documentation for check_bridge_distribution_setting().
2017-10-24 19:26:24 -04:00
Nick Mathewson
613b18f0af
Always set bridge-distribution-request on bridges' descriptors.
...
Also, warn the user if the BridgeDistribution option is
unrecognized, and reject the value if it is invalid.
2017-10-24 19:26:24 -04:00
Nick Mathewson
3581f93d27
Tweak the documentation for BridgeDistribution
...
Note that it will have no effect yet; note that the default is
"any".
2017-10-24 19:26:24 -04:00
Roger Dingledine
ebab521525
Add new BridgeDistribution config option
...
Bridge relays can use it to add a "bridge-distribution-request" line
to their bridge descriptor, which tells BridgeDB how they'd like their
bridge address to be given out.
Implements tickets 18329.
2017-10-24 19:26:24 -04:00
Nick Mathewson
f709dce414
Repair "make check"
2017-10-24 12:54:21 -04:00
Nick Mathewson
649000662d
Merge remote-tracking branch 'arma/ticket23637'
2017-10-24 12:52:41 -04:00
Nick Mathewson
122a7f8848
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-10-24 09:11:38 -04:00
Nick Mathewson
350fecfafe
Merge branch 'maint-0.3.2'
2017-10-24 09:11:38 -04:00
Nick Mathewson
990322fca4
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" merge to avoid version bump
2017-10-24 09:11:33 -04:00
Nick Mathewson
7bebd1b025
Merge branch 'maint-0.2.9' into maint-0.3.0
...
"ours" merge to avoid version bump
2017-10-24 09:11:24 -04:00
Nick Mathewson
5325e7ccab
bump version in the other places :/
2017-10-24 09:11:17 -04:00
Nick Mathewson
552b620280
bump version in the other places :/
2017-10-24 09:11:07 -04:00
Nick Mathewson
51de3a1c15
Merge branch 'maint-0.3.2'
2017-10-24 09:10:43 -04:00
Nick Mathewson
cce1a6efa6
Merge branch 'maint-0.3.1' into maint-0.3.2
...
"ours" merge to avoid version bump
2017-10-24 09:10:37 -04:00
Nick Mathewson
38a58076e9
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" merge to avoid version bump
2017-10-24 09:10:30 -04:00
Nick Mathewson
302b5f577d
Merge branch 'maint-0.2.9' into maint-0.3.0
...
"ours" merge to avoid version bump
2017-10-24 09:10:24 -04:00
Nick Mathewson
725f237104
Merge branch 'maint-0.2.8' into maint-0.2.9
...
"ours" merge to avoid version bump
2017-10-24 09:10:17 -04:00
Nick Mathewson
912ebf165f
Merge branch 'maint-0.2.5' into maint-0.2.8
...
"ours" merge to avoid version bump
2017-10-24 09:10:04 -04:00
Nick Mathewson
cbb41ddfef
bump to 0.3.1.8
2017-10-24 09:09:50 -04:00
Nick Mathewson
d913a7317b
bump to 0.3.0.12
2017-10-24 09:09:35 -04:00
Nick Mathewson
09d2ae562a
bump to 0.2.9.13
2017-10-24 09:09:26 -04:00
Nick Mathewson
d4befa035d
bump to 0.2.8.16
2017-10-24 09:09:10 -04:00
Nick Mathewson
743eee4930
bump to 0.2.5.15
2017-10-24 09:09:00 -04:00
Nick Mathewson
abbd6a36fc
Merge branch 'maint-0.3.2'
2017-10-24 08:25:29 -04:00
Nick Mathewson
0d4addfc73
Merge branch 'bug23952_032' into maint-0.3.2
2017-10-24 08:24:12 -04:00
Nick Mathewson
f0a6ea0bfd
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-23 15:55:48 -04:00
Nick Mathewson
f7707c9031
Merge branch 'maint-0.3.2'
2017-10-23 15:55:48 -04:00
Nick Mathewson
b1d6cf2508
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-10-23 15:55:48 -04:00
Nick Mathewson
9ae4ffc076
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 15:55:08 -04:00
Nick Mathewson
b1bd1bf19f
Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9
2017-10-23 15:53:45 -04:00
Nick Mathewson
48ee85e0c6
Have LOG_PROTOCOL_WARN call its own function
...
Also, make the function that implements LOG_PROTOCOL_WARN use a
cached value of the desired loglevel, rather than calling
get_options().
2017-10-23 12:22:26 -04:00
Nick Mathewson
880d596f4d
Merge branch 'maint-0.3.2'
2017-10-23 09:22:57 -04:00
Nick Mathewson
8b8d501040
Merge branch 'maint-0.3.1' into maint-0.3.2
...
"ours" merge to avoid taking af33fdd7c1
2017-10-23 09:22:43 -04:00
Nick Mathewson
af33fdd7c1
Remove the length limit from write_http_status_line
...
Fixes bug 23908; bugfix on 0.3.1.6-rc when we made the keypin
failure message really long.
Backport from 0.3.2's 771fb7e7ba
2017-10-23 09:21:22 -04:00
Nick Mathewson
fcd5c3144a
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-23 09:11:10 -04:00
Nick Mathewson
eac4c374e4
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 09:11:10 -04:00
Nick Mathewson
49e8352f16
Merge branch 'maint-0.3.2'
2017-10-23 09:11:10 -04:00
Nick Mathewson
6a7aa47357
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-10-23 09:11:10 -04:00
Nick Mathewson
85115796bb
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-23 09:11:10 -04:00
Nick Mathewson
a5f5bda462
Adjust test, now that there are 9 dirauths again
2017-10-23 09:11:07 -04:00
Nick Mathewson
1db5081ba1
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-23 09:06:34 -04:00
Nick Mathewson
c93ecb8189
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 09:06:34 -04:00
Nick Mathewson
d99c6b7252
Merge branch 'maint-0.3.2'
2017-10-23 09:06:34 -04:00
