David Goulet
d9821bdea5
Merge branch 'maint-0.4.7'
2023-01-12 11:07:40 -05:00
David Goulet
64cebf4e1b
Merge branch 'maint-0.4.5' into maint-0.4.7
2023-01-12 11:07:39 -05:00
Tor CI Release
049d0818c6
Update geoip files to match ipfire location db, 2023/01/12.
2023-01-12 11:07:23 -05:00
David Goulet
d75d02d202
Merge branch 'maint-0.4.7'
2022-12-06 10:10:41 -05:00
David Goulet
d889eba875
Merge branch 'maint-0.4.5' into maint-0.4.7
2022-12-06 10:10:41 -05:00
Tor CI Release
ec0414270a
Update geoip files to match ipfire location db, 2022/12/06.
2022-12-06 10:09:26 -05:00
David Goulet
8b345f8ced
geoip: Update files from latest 047 release
...
We need all geoip files to be the same so our release CI can generate a
new list and apply it uniformly on all series.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-12-06 09:47:55 -05:00
David Goulet
e14c4fe771
Merge branch 'maint-0.4.7'
2022-11-10 09:44:52 -05:00
Tor CI Release
e39be4a14f
Update geoip files to match ipfire location db, 2022/11/10.
2022-11-10 09:43:47 -05:00
David Goulet
dcbedc6c3f
Merge branch 'tor-gitlab/mr/596'
2022-10-26 15:27:03 -04:00
David Goulet
0cc27ecfdc
Merge branch 'maint-0.4.7'
2022-08-12 09:56:54 -04:00
David Goulet
c4ff6a4f55
Merge branch 'maint-0.4.6' into maint-0.4.7
2022-08-12 09:56:54 -04:00
David Goulet
8244eefcd3
Merge branch 'maint-0.4.5' into maint-0.4.6
2022-08-12 09:56:54 -04:00
David Goulet
bb88086c72
geoip: Update geoip files with August 9th, 2022 database
...
Fixes #40658
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-08-12 09:56:50 -04:00
David Goulet
c142b59503
Merge branch 'maint-0.4.7'
2022-08-11 09:44:47 -04:00
David Goulet
9b4d3ed492
Merge branch 'maint-0.4.6' into maint-0.4.7
2022-08-11 09:44:47 -04:00
David Goulet
c65d8b2aad
Merge branch 'maint-0.4.5' into maint-0.4.6
2022-08-11 09:44:47 -04:00
Tor CI Release
f9acdd0630
Update geoip files to match ipfire location db, 2022/08/11.
2022-08-11 09:44:32 -04:00
David Goulet
9d88a8be31
geoip: Get latest from maint-0.4.7
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-08-10 13:43:46 -04:00
David Goulet
e465f511a5
Merge branch 'maint-0.4.5' into maint-0.4.6
2022-08-10 13:41:25 -04:00
David Goulet
13d2d1246f
geoip: Update files from maint-0.4.7
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-08-10 13:41:22 -04:00
Gus
07c9a0fabf
torrc: Fix docs links
2022-06-29 14:54:20 +00:00
Tor CI Release
223886c118
Update geoip files to match ipfire location db, 2022/06/17.
2022-06-17 10:04:06 -04:00
David Goulet
d18b118bcc
Merge branch 'tor-gitlab/mr/568'
2022-05-24 13:09:36 -04:00
Tor CI Release
2270648baa
Update geoip files to match ipfire location db, 2022/04/27.
2022-04-27 09:41:28 -04:00
Alex Xu (Hello71)
71b68f32eb
Remove fallback-consensus rule
...
This rule has not been used since 4ead083dbcf742b33d85
2022-04-27 01:34:09 -04:00
Tor CI Release
28193dbf9d
Update geoip files to match ipfire location db, 2022/04/07.
2022-04-07 09:00:42 -04:00
Tor CI Release
aaac633eb0
Update geoip files to match ipfire location db, 2022/03/25.
2022-03-25 09:10:16 -04:00
Tor CI Release
a424f6c7bf
Update geoip files to match ipfire location db, 2022/02/25.
2022-02-25 09:11:55 -05:00
David Goulet
d0d45a97d8
Merge branch 'maint-0.4.6'
2022-02-04 11:07:34 -05:00
David Goulet
728191fc2e
Merge branch 'maint-0.4.5' into maint-0.4.6
2022-02-04 11:07:34 -05:00
Tor CI Release
5ab4fa9fd8
Update geoip files to match ipfire location db, 2022/02/04.
2022-02-04 11:05:13 -05:00
Tor CI Release
cfe022d01d
Update geoip files to match ipfire location db, 2021/12/15.
2022-02-04 10:56:29 -05:00
David Goulet
7a8aa8e36d
Merge branch 'maint-0.4.6'
2021-12-16 09:28:17 -05:00
Tor CI Release
9a4366b3e3
Update geoip files to match ipfire location db, 2021/12/15.
2021-12-16 09:27:46 -05:00
David Goulet
4252744788
Merge branch 'maint-0.4.6'
2021-08-12 12:13:26 -04:00
David Goulet
4c3c40e70c
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-08-12 12:13:26 -04:00
David Goulet
33abeeab94
Merge branch 'maint-0.3.5' into maint-0.4.5
2021-08-12 12:13:25 -04:00
Alexander Færøy
eca5b62213
Update GeoIP files to match IPFire location DB as per 2021/08/12.
2021-08-12 15:38:11 +00:00
Cecylia Bocovich
16e517245b
Update torrc to encourage use of BridgeDistribution
...
Bridge operators should generally publish their descriptors except for
rare cases, and instead use the BridgeDistribution none setting to
prevent their bridge from being distributed by BridgeDB.
2021-07-06 13:09:24 -04:00
Nick Mathewson
cb38219664
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-06-10 08:21:48 -04:00
Nick Mathewson
d60f8fe98a
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-06-10 08:21:48 -04:00
Nick Mathewson
57a41348ee
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-06-10 08:21:47 -04:00
Nick Mathewson
520d5c108f
Update geoip files to match ipfire location db, 2021/06/10.
2021-06-10 08:20:13 -04:00
Nick Mathewson
0397a9cb49
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-05-07 09:53:58 -04:00
Nick Mathewson
7fe819c951
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-05-07 09:53:58 -04:00
Nick Mathewson
f68aeda549
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-05-07 09:53:57 -04:00
Nick Mathewson
621f8a304a
Update geoip files to match ipfire location db, 2021/05/07.
2021-05-07 09:53:46 -04:00
Nick Mathewson
1f21b6e6a7
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-04-13 10:36:01 -04:00
Nick Mathewson
1b48a28a74
Merge branch 'maint-0.4.5'
2021-04-13 10:36:01 -04:00
