Nick Mathewson
|
53c3174ee4
|
Merge branch 'maint-0.2.8' into maint-0.2.9
|
2017-11-18 11:01:43 -05:00 |
|
Nick Mathewson
|
d388f9d879
|
Merge branch 'maint-0.2.5' into maint-0.2.8
|
2017-11-18 11:01:33 -05:00 |
|
Nick Mathewson
|
831d3b794d
|
Merge branch 'ticket18329_minimal_025' into maint-0.2.5
|
2017-11-18 11:00:45 -05:00 |
|
Nick Mathewson
|
9f2efd02a1
|
Minimal implementation of bridge-distribution-request
Just advertise the line when we're a bridge, using "any" if we're
published or "none" if we aren't.
This is done in lieu of a full backport of #18329.
|
2017-11-13 20:44:51 -05:00 |
|
Nick Mathewson
|
1d5e693b63
|
Merge branch 'maint-0.3.0' into maint-0.3.1
|
2017-11-13 20:36:04 -05:00 |
|
Nick Mathewson
|
50fbede459
|
Merge branch 'maint-0.2.9' into maint-0.3.0
|
2017-11-13 20:36:04 -05:00 |
|
Nick Mathewson
|
1b9bb2c847
|
Merge branch 'bug22895_027' into maint-0.2.9
|
2017-11-13 20:35:59 -05:00 |
|
Nick Mathewson
|
562b3c9678
|
Merge branch 'maint-0.3.0' into maint-0.3.1
|
2017-11-13 12:57:58 -05:00 |
|
Nick Mathewson
|
fea5c8a015
|
Merge branch 'maint-0.2.9' into maint-0.3.0
|
2017-11-13 12:57:58 -05:00 |
|
Nick Mathewson
|
543fd89fb7
|
Merge branch 'maint-0.2.8' into maint-0.2.9
|
2017-11-13 12:57:58 -05:00 |
|
Nick Mathewson
|
800797e7f3
|
Merge branch 'bug23291_028' into maint-0.2.8
|
2017-11-13 12:57:55 -05:00 |
|
David Goulet
|
7df28ce299
|
hs-v3: Fix consensus param "hsdir-interval" name
The dir-spec.txt specifies it to be "hsdir_interval" (underscore).
Fixes #24262
Signed-off-by: David Goulet <dgoulet@torproject.org>
|
2017-11-13 11:48:56 -05:00 |
|
Nick Mathewson
|
16bdb9e365
|
Merge branch 'maint-0.2.9' into maint-0.3.0
|
2017-11-13 11:18:02 -05:00 |
|
Nick Mathewson
|
91188540af
|
Merge branch 'maint-0.3.0' into maint-0.3.1
|
2017-11-13 11:18:02 -05:00 |
|
Nick Mathewson
|
ab415ae950
|
Merge remote-tracking branch 'teor/bug23470-029' into maint-0.2.9
|
2017-11-13 11:17:58 -05:00 |
|
Nick Mathewson
|
9092e9019a
|
Merge branch 'maint-0.2.9' into maint-0.3.0
|
2017-11-13 11:15:50 -05:00 |
|
Nick Mathewson
|
89b9951ecd
|
Merge branch 'maint-0.3.0' into maint-0.3.1
|
2017-11-13 11:15:50 -05:00 |
|
Nick Mathewson
|
666653758d
|
Merge branch 'bug8185_025' into maint-0.2.9
|
2017-11-13 11:15:47 -05:00 |
|
Nick Mathewson
|
0fc2b7f82e
|
Merge branch 'bug8185_031' into maint-0.3.1
|
2017-11-13 11:15:40 -05:00 |
|
Nick Mathewson
|
ece63105d9
|
Merge branch 'maint-0.2.9' into maint-0.3.0
|
2017-11-13 11:13:22 -05:00 |
|
Nick Mathewson
|
2777b469fa
|
Merge branch 'maint-0.3.0' into maint-0.3.1
|
2017-11-13 11:13:22 -05:00 |
|
Nick Mathewson
|
c928fb988a
|
Merge branch 'ticket21953_029' into maint-0.2.9
|
2017-11-13 11:13:18 -05:00 |
|
Nick Mathewson
|
ef92511577
|
Merge branch 'maint-0.3.0' into maint-0.3.1
|
2017-11-11 12:23:34 -05:00 |
|
Nick Mathewson
|
9666c620d5
|
Merge branch 'maint-0.2.8' into maint-0.2.9
|
2017-11-11 12:23:33 -05:00 |
|
Nick Mathewson
|
c9b76a12f5
|
Merge branch 'maint-0.2.5' into maint-0.2.8
|
2017-11-11 12:23:33 -05:00 |
|
Nick Mathewson
|
5348c8996f
|
Merge branch 'maint-0.2.9' into maint-0.3.0
|
2017-11-11 12:23:33 -05:00 |
|
Karsten Loesing
|
6f8c32b7de
|
Update geoip and geoip6 to the November 6 2017 database.
|
2017-11-10 10:14:09 +01:00 |
|
Sebastian Hahn
|
9827574308
|
Fix DNS resolution on busy exit relays
Thanks to Dhalgren who analyzed this issue two years ago and found a
solution!
|
2017-11-05 14:36:32 -05:00 |
|
Nick Mathewson
|
5a21b27083
|
Merge branch 'maint-0.3.0' into maint-0.3.1
|
2017-10-31 11:43:14 -04:00 |
|
Nick Mathewson
|
f2e23d38ab
|
Merge branch 'maint-0.2.9' into maint-0.3.0
|
2017-10-31 11:43:14 -04:00 |
|
Nick Mathewson
|
04d4786cc4
|
Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9
|
2017-10-31 11:43:07 -04:00 |
|
Nick Mathewson
|
7c2f688fb9
|
Merge branch 'maint-0.3.0' into maint-0.3.1
"ours" merge to avoid version bump
|
2017-10-25 09:28:49 -04:00 |
|
Nick Mathewson
|
6ce8cc5dbb
|
Merge branch 'maint-0.2.9' into maint-0.3.0
"ours" merge to avoid version bump
|
2017-10-25 09:28:41 -04:00 |
|
Nick Mathewson
|
151d5ededf
|
Merge branch 'maint-0.2.8' into maint-0.2.9
"ours" merge to avoid version bump
|
2017-10-25 09:28:29 -04:00 |
|
Nick Mathewson
|
faf568fa7e
|
Merge branch 'maint-0.2.5' into maint-0.2.8
"ours" merge to avoid version bump
|
2017-10-25 09:28:15 -04:00 |
|
Nick Mathewson
|
f68c1b1406
|
bump to 0.3.1.8-dev
|
2017-10-25 09:28:05 -04:00 |
|
Nick Mathewson
|
4edbbee2fd
|
bump to 0.3.0.12-dev
|
2017-10-25 09:27:50 -04:00 |
|
Nick Mathewson
|
46091a88ca
|
bump to 0.2.9.13-dev
|
2017-10-25 09:27:23 -04:00 |
|
Nick Mathewson
|
9969b0dfda
|
bump to 0.2.8.16-dev
|
2017-10-25 09:27:07 -04:00 |
|
Nick Mathewson
|
82f8b27ff5
|
bump to 0.2.5.15-dev
|
2017-10-25 09:26:53 -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
|
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 |
|