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
Nick Mathewson
b323e6b8c2
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-04-13 10:36:00 -04:00
Nick Mathewson
32f5ad7665
Update geoip files to match ipfire location db, 2021/04/13.
2021-04-13 10:35:50 -04:00
Nick Mathewson
e9c950af82
src/config/README: add documentation for geoip format.
2021-04-02 12:37:13 -04:00
Nick Mathewson
d7e827a754
Remove MMDB conversion tool.
...
It was made to convert Maxmind's "mmdb" files into the older format
that we used. But now thanks to IPFire Location, we don't have to
touch Maxmind formats any more. (See ticket #40224.)
2021-03-12 11:37:03 -05:00
Nick Mathewson
b014866f6a
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-03-12 11:30:22 -05:00
Nick Mathewson
41796158e6
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-03-12 11:30:21 -05:00
Nick Mathewson
a7b3cb06f5
Update geoip files to match ipfire location db, 2021/03/12.
2021-03-12 11:26:07 -05:00
Samanta Navarro
4a0cd79588
Fix typos.
...
Typos found with codespell.
Please keep in mind that this should have impact on actual code
and must be carefully evaluated:
src/core/or/lttng_circuit.inc
- ctf_enum_value("CONTROLER", CIRCUIT_PURPOSE_CONTROLLER)
+ ctf_enum_value("CONTROLLER", CIRCUIT_PURPOSE_CONTROLLER)
2020-11-12 11:44:09 -05:00
Daniel Pinto
34fa2c4d0d
Add support for patterns on %include #25140
...
Also adds generic tor_glob function to expand globs.
2020-07-15 22:01:08 +01:00
JeremyRand
0be80fb650
Bug 31812: Change http URL's to https
2020-07-13 10:42:46 -04:00
teor
1619f14a04
python: Add __future__ imports for python 3 compatibility
...
Except for src/ext, which we may not want to modify.
Closes ticket 32732.
2019-12-12 15:58:51 +10:00
Nick Mathewson
3248630fc8
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-12-06 16:02:08 -05:00
Nick Mathewson
6513102b9d
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-12-06 16:02:08 -05:00
Nick Mathewson
74cae547e5
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-12-06 16:02:07 -05:00
Nick Mathewson
c7ca3fc186
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-12-06 16:02:07 -05:00
Karsten Loesing
b7b467d3af
Update geoip and geoip6 to the December 3 2019 database.
2019-12-06 11:50:35 +01:00
Nick Mathewson
29eb7b07ef
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-11-11 10:14:04 -05:00
Nick Mathewson
a920597f62
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-11-11 10:14:04 -05:00
Nick Mathewson
329aa1c48e
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-11-11 10:14:03 -05:00
Nick Mathewson
7beaaed245
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-11-11 10:14:03 -05:00
Karsten Loesing
853b6ad095
Update geoip and geoip6 to the November 6 2019 database.
2019-11-09 10:10:19 +01:00
Nick Mathewson
a74c180691
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-02 08:01:34 -04:00
Nick Mathewson
4dcbbe4166
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-10-02 08:01:34 -04:00
Nick Mathewson
c81e1e4542
Merge branch 'maint-0.4.1'
2019-10-02 08:01:34 -04:00
Nick Mathewson
7b9cb4c47b
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-10-02 08:01:33 -04:00
Karsten Loesing
90de776ea9
Update geoip and geoip6 to the October 1 2019 database.
2019-10-02 11:11:27 +02:00
teor
a57e168caa
Merge remote-tracking branch 'tor-github/pr/741' into maint-0.3.5
2019-08-12 09:36:14 +10:00
Ali Raheem
57c34e80da
#31320 Add IPv6 examples
2019-08-05 19:24:42 +01:00
Nick Mathewson
afa2c39baa
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-06-11 10:17:18 -04:00
Nick Mathewson
ce89fe36c8
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-06-11 10:17:18 -04:00
Nick Mathewson
b0fa1f4fb0
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-06-11 10:17:17 -04:00
Karsten Loesing
0ec4ebd00d
Update geoip and geoip6 to the June 10 2019 database.
2019-06-11 16:12:50 +02:00
Nick Mathewson
04cb2d4010
Merge remote-tracking branch 'tor-github/pr/741' into maint-0.4.0
2019-06-05 16:14:51 -04:00
Nick Mathewson
9cec7a7b5c
Merge branch 'maint-0.4.0'
2019-05-17 08:10:17 -04:00
Nick Mathewson
e5deb2bbc7
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-05-17 08:10:16 -04:00
Nick Mathewson
c7f9f7e542
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-05-17 08:10:16 -04:00
Nick Mathewson
a521c42788
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-05-17 08:10:15 -04:00
Karsten Loesing
4e262196a8
Update geoip and geoip6 to the May 13 2019 database.
2019-05-17 08:52:13 +02:00
Neel Chauhan
06c76e79aa
Clarify torrc comment for IPv6Exit
2019-04-16 08:20:48 -04:00
Neel Chauhan
03464a9165
Update torrc.sample.in to IPv6Exit 1 being an exit by default
2019-04-14 12:48:07 -04:00
