 Nick Mathewson
|
c7ca3fc186
|
Merge branch 'maint-0.3.5' into maint-0.4.0
|
2019-12-06 16:02:07 -05:00 |
|
|
Nick Mathewson
|
74cae547e5
|
Merge branch 'maint-0.2.9' into maint-0.3.5
|
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
|
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
|
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 |
|
|
Nick Mathewson
|
afa2c39baa
|
Merge branch 'maint-0.3.5' into maint-0.4.0
|
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
|
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 |
|
|
Nick Mathewson
|
de76862fd6
|
Merge branch 'maint-0.3.5' into maint-0.4.0
|
2019-04-03 09:27:44 -04:00 |
|
|
Nick Mathewson
|
4aa02d3c7a
|
Merge branch 'maint-0.3.4' into maint-0.3.5
|
2019-04-03 09:27:43 -04:00 |
|
|
Nick Mathewson
|
3cfcfbac46
|
Merge branch 'maint-0.2.9' into maint-0.3.4
|
2019-04-03 09:27:42 -04:00 |
|
|
Karsten Loesing
|
54e249e269
|
Update geoip and geoip6 to the April 2 2019 database.
|
2019-04-03 09:26:28 +02:00 |
|
|
Nick Mathewson
|
9b4ecbaa7d
|
Merge branch 'maint-0.3.5' into maint-0.4.0
|
2019-03-06 14:29:43 -05:00 |
|
|
Nick Mathewson
|
d6f77b99da
|
Merge branch 'maint-0.3.4' into maint-0.3.5
|
2019-03-06 14:29:38 -05:00 |
|
|
Nick Mathewson
|
155b0f5521
|
Merge branch 'maint-0.3.3' into maint-0.3.4
|
2019-03-06 14:29:33 -05:00 |
|
|
Nick Mathewson
|
0c9cd7c487
|
Merge branch 'maint-0.2.9' into maint-0.3.3
|
2019-03-06 14:29:29 -05:00 |
|
|
Karsten Loesing
|
2e74edb53e
|
Update geoip and geoip6 to the March 4 2019 database.
|
2019-03-06 11:45:27 +01:00 |
|
|
teor
|
9b7cdd23de
|
doc: update the man page and sample torrc for ExitRelay
We changed the default of ExitRelay in #21530 in 0.3.5.1-alpha, but
forgot to update the documentation.
Closes 29612.
|
2019-02-28 11:22:20 +10:00 |
|
|
Nick Mathewson
|
a797a69679
|
Merge branch 'maint-0.3.5'
|
2019-02-12 09:56:50 -05:00 |
|
|
Nick Mathewson
|
db209d4dba
|
Merge branch 'maint-0.3.3' into maint-0.3.4
|
2019-02-12 09:56:49 -05:00 |
|
|
Nick Mathewson
|
7ead2af622
|
Merge branch 'maint-0.2.9' into maint-0.3.3
|
2019-02-12 09:56:49 -05:00 |
|
|
Nick Mathewson
|
2e770216c4
|
Merge branch 'maint-0.3.4' into maint-0.3.5
|
2019-02-12 09:56:49 -05:00 |
|
|
Karsten Loesing
|
a3f9ddcf03
|
Update geoip and geoip6 to the February 5 2019 database.
|
2019-02-12 14:40:42 +01:00 |
|
|
Nick Mathewson
|
85c5f58509
|
Merge branch 'maint-0.3.4' into maint-0.3.5
|
2019-01-07 08:43:46 -05:00 |
|
|
Nick Mathewson
|
fe26e1f1c8
|
Merge branch 'maint-0.3.5'
|
2019-01-07 08:43:46 -05:00 |
|
|
Nick Mathewson
|
3d18903f53
|
Merge branch 'maint-0.3.3' into maint-0.3.4
|
2019-01-07 08:43:45 -05:00 |
|
|
Nick Mathewson
|
ba71b17865
|
Merge branch 'maint-0.2.9' into maint-0.3.3
|
2019-01-07 08:43:45 -05:00 |
|
|
Karsten Loesing
|
445d6750f7
|
Update geoip and geoip6 to the January 3 2019 database.
|
2019-01-07 09:00:29 +01:00 |
|
|
Nick Mathewson
|
2ccb9e9444
|
Merge branch 'maint-0.3.5'
|
2018-12-06 09:26:34 -05:00 |
|
|
Nick Mathewson
|
c1f86f7492
|
Merge branch 'maint-0.3.4' into maint-0.3.5
|
2018-12-06 09:26:33 -05:00 |
|
|
Nick Mathewson
|
c4f7953d8b
|
Merge branch 'maint-0.3.3' into maint-0.3.4
|
2018-12-06 09:26:32 -05:00 |
|
|
Nick Mathewson
|
00341d97f3
|
Merge branch 'maint-0.2.9' into maint-0.3.3
|
2018-12-06 09:26:32 -05:00 |
|
|
Karsten Loesing
|
57798eb1cb
|
Update geoip and geoip6 to the December 5 2018 database.
|
2018-12-05 21:02:39 +01:00 |
|
|
Nick Mathewson
|
e27dff08a3
|
Merge branch 'maint-0.3.5'
|
2018-11-11 11:57:54 -05:00 |
|
|
Nick Mathewson
|
6b2ff4fff8
|
Merge branch 'maint-0.3.3' into maint-0.3.4
|
2018-11-11 11:57:53 -05:00 |
|
|
Nick Mathewson
|
76ed869ff9
|
Merge branch 'maint-0.3.4' into maint-0.3.5
|
2018-11-11 11:57:53 -05:00 |
|
|
Nick Mathewson
|
d0c3723c38
|
Merge branch 'maint-0.2.9' into maint-0.3.3
|
2018-11-11 11:57:52 -05:00 |
|
|
Karsten Loesing
|
5ba3d09a89
|
Update geoip and geoip6 to the November 6 2018 database.
|
2018-11-11 11:25:59 +01:00 |
|
 Jay Bitron
|
b0c41e3ec2
|
Fix the missing unpack function in mmdb-convert.py
|
2018-10-10 14:12:53 -07:00 |
|
|
Nick Mathewson
|
a23c36ebcd
|
Merge branch 'maint-0.3.4'
|
2018-10-10 11:34:49 -04:00 |
|