Nick Mathewson
d642ceb8df
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-03-08 10:12:06 -05:00
Nick Mathewson
25c28bc2d9
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-03-08 10:11:05 -05:00
Nick Mathewson
ecc73c3c03
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-03-08 10:10:44 -05:00
Nick Mathewson
933a1e7997
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-03-08 10:10:29 -05:00
Karsten Loesing
4488c319dd
Update geoip and geoip6 to the March 7 2017 database.
2017-03-08 09:41:35 +01:00
Nick Mathewson
aec45bc0b1
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-02-17 17:10:47 -05:00
Nick Mathewson
d9827e4729
Merge branch 'maint-0.2.9'
2017-02-13 14:41:43 -05:00
Nick Mathewson
a86f95df5c
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-02-13 14:38:03 -05:00
Nick Mathewson
75fe218b16
Merge branch 'maint-0.2.6' into maint-0.2.7
2017-02-13 14:37:49 -05:00
Nick Mathewson
43c18b1b7a
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-13 14:37:42 -05:00
Nick Mathewson
124062e843
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-02-13 14:37:01 -05:00
Karsten Loesing
f6016058b4
Update geoip and geoip6 to the February 8 2017 database.
2017-02-12 15:56:31 +01:00
Nick Mathewson
e91bb84a91
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
...
maint-0.2.7-redux is an attempt to try to re-create a plausible
maint-0.2.7 branch. I've started from the tor-0.2.7.6, and then I
merged maint-0.2.6 into the branch.
This has produced 2 conflicts: one related to the
rendcommon->rendcache move, and one to the authority refactoring.
2017-02-07 09:59:12 -05:00
Nick Mathewson
81c78ec755
Outbindbindaddress variants for Exit and OR.
...
Allow separation of exit and relay traffic to different source IP
addresses (Ticket #17975 ). Written by Michael Sonntag.
2017-01-27 08:05:29 -05:00
Nick Mathewson
0809690b48
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-01-11 09:13:34 -05:00
Nick Mathewson
8c91cbb6ca
Merge branch 'maint-0.2.6' into maint-0.2.7
2017-01-11 09:12:51 -05:00
Nick Mathewson
54771bcaba
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-01-11 09:12:21 -05:00
Nick Mathewson
34fdd510ef
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-01-11 09:11:58 -05:00
Karsten Loesing
3833f67dd2
Update geoip and geoip6 to the January 4 2017 database.
2017-01-04 10:19:52 +01:00
Nick Mathewson
adaf6a422a
Merge branch 'maint-0.2.8' into maint-0.2.9
2016-12-09 08:34:24 -05:00
Nick Mathewson
b49369badd
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-12-09 08:34:12 -05:00
Nick Mathewson
3d9f8ff6a5
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-12-09 08:34:06 -05:00
Nick Mathewson
3d2d3f2b62
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-12-09 08:33:57 -05:00
Karsten Loesing
9db47e7921
Update geoip and geoip6 to the December 7 2016 database.
2016-12-09 10:23:36 +01:00
Nick Mathewson
e4ef9f7491
In torrc.sample.in, note that bandwidth must be >=75 KB.
...
Queue a corresponding change for torrc.minimal.in.
Closes ticket 20085.
2016-11-08 19:23:49 -05:00
Nick Mathewson
e4b793fe41
Merge branch 'maint-0.2.8' into maint-0.2.9
2016-11-07 09:32:00 -05:00
Nick Mathewson
f5fdf188b9
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-11-07 09:30:42 -05:00
Nick Mathewson
6c2174d44d
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-11-07 09:30:16 -05:00
Nick Mathewson
db2571be61
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-11-07 09:29:54 -05:00
Karsten Loesing
ea597832e2
Update geoip and geoip6 to the November 3 2016 database.
2016-11-07 15:05:19 +01:00
Nick Mathewson
7410adb330
Merge branch 'maint-0.2.8'
2016-10-06 09:59:49 -04:00
Nick Mathewson
ec718aa839
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-10-06 09:59:18 -04:00
Nick Mathewson
12a7298376
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-10-06 09:59:03 -04:00
Nick Mathewson
304d8f3bbb
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-10-06 09:58:54 -04:00
Karsten Loesing
1b4984f196
Update geoip and geoip6 to the October 6 2016 database.
2016-10-05 16:35:14 +02:00
Nick Mathewson
c897328fee
Merge remote-tracking branch 'samdney/ticket19209'
2016-09-12 08:58:04 -04:00
Carolin Zöbelein
87b91949f1
Add some clarifications in the comments. Bug 19209
2016-09-11 01:30:02 +02:00
Nick Mathewson
f028434a5f
Merge branch 'maint-0.2.8'
2016-09-07 13:54:21 -04:00
Nick Mathewson
11edbf4808
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-09-07 13:54:03 -04:00
Nick Mathewson
52a99cb6c1
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-09-07 13:53:53 -04:00
Nick Mathewson
e4d82da05b
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-09-07 13:53:43 -04:00
Karsten Loesing
56f95ba94d
Update geoip and geoip6 to the September 6 2016 database.
2016-09-07 11:08:04 +02:00
Nick Mathewson
a7e317927b
Merge branch 'maint-0.2.8'
2016-08-12 10:27:23 -04:00
Nick Mathewson
db372addc8
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-08-12 10:27:08 -04:00
Nick Mathewson
742ff2cddb
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-08-12 10:27:01 -04:00
Nick Mathewson
46754d6081
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-08-12 10:26:48 -04:00
Karsten Loesing
1410947351
Update geoip and geoip6 to the August 2 2016 database.
2016-08-12 11:53:38 +02:00
Roger Dingledine
81cc31d3fa
three typo fixes i found in my sandbox
2016-07-25 20:17:35 -04:00
Nick Mathewson
a31078a581
Merge branch 'maint-0.2.8'
2016-07-19 12:34:37 +02:00
Nick Mathewson
4d70ed7be0
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-07-19 12:32:14 +02:00
Nick Mathewson
210928f66a
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-07-19 12:31:54 +02:00
Nick Mathewson
d95c2809b3
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-07-19 12:31:20 +02:00
Karsten Loesing
79939c6f11
Update geoip and geoip6 to the July 6 2016 database.
2016-07-18 08:40:22 +02:00
Nick Mathewson
6a7d11f38a
Merge branch 'maint-0.2.8'
2016-06-13 10:49:24 -04:00
Nick Mathewson
80089c9e7c
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-06-13 10:48:56 -04:00
Nick Mathewson
b4bb88606e
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-06-13 10:48:48 -04:00
Nick Mathewson
f25f7b759c
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-06-13 10:48:35 -04:00
Karsten Loesing
c14c662758
Update geoip and geoip6 to the June 7 2016 database.
2016-06-12 11:35:50 +02:00
Nick Mathewson
7fa11a92d5
Merge branch 'maint-0.2.8'
2016-05-09 14:59:47 -04:00
Nick Mathewson
7fe80c2905
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-05-09 14:56:56 -04:00
Nick Mathewson
0b477bfd55
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-05-09 14:55:45 -04:00
Nick Mathewson
368146370b
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-05-09 14:55:22 -04:00
Karsten Loesing
3c2d4611ce
Update geoip and geoip6 to the May 4 2016 database.
2016-05-09 17:51:15 +02:00
Nick Mathewson
7532cd439b
When we get a bad nickname, explain what a good one is.
...
Closes #18300 ; patch from "icanhasaccount".
2016-04-07 10:54:53 -04:00
Nick Mathewson
ad4ff7a5b9
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-04-07 10:45:46 -04:00
Nick Mathewson
2ce99b9f48
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-04-07 10:45:38 -04:00
Nick Mathewson
34a51d1621
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-04-07 10:45:32 -04:00
Karsten Loesing
97c6e717b9
Update geoip and geoip6 to the April 5 2016 database.
2016-04-07 11:10:09 +02:00
Nick Mathewson
17cfdb358c
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-03-09 10:36:50 -05:00
Nick Mathewson
443dddb749
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-03-09 10:36:35 -05:00
Nick Mathewson
21f9829e79
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-03-09 10:36:20 -05:00
Karsten Loesing
8e2640b15a
Update geoip and geoip6 to the March 3 2016 database.
2016-03-04 10:56:51 +01:00
Nick Mathewson
d920cbb82c
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-02-05 08:13:35 -05:00
Nick Mathewson
44ad3be221
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-02-05 08:13:24 -05:00
Nick Mathewson
f06d9a9cef
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-02-05 08:13:13 -05:00
Karsten Loesing
d5ac79e056
Update geoip and geoip6 to the February 2 2016 database.
2016-02-04 08:53:24 +01:00
Nick Mathewson
d9b11d05e8
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-01-07 09:14:15 -08:00
Nick Mathewson
400df18688
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-01-07 09:14:05 -08:00
Nick Mathewson
ae223138fb
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-01-07 09:13:54 -08:00
Karsten Loesing
1496056c12
Update geoip and geoip6 to the January 5 2016 database.
2016-01-07 11:10:37 +01:00
Nick Mathewson
9c66afe772
Merge branch 'maint-0.2.6' into maint-0.2.7
2015-12-07 10:11:21 -05:00
Nick Mathewson
089ee13534
Merge branch 'maint-0.2.5' into maint-0.2.6
2015-12-07 10:10:44 -05:00
Nick Mathewson
e8e89fd7a1
Merge branch 'maint-0.2.4' into maint-0.2.5
2015-12-07 10:10:21 -05:00
Karsten Loesing
dbb919cf94
Update geoip and geoip6 to the December 1 2015 database.
2015-12-05 17:02:59 +01:00
Nick Mathewson
7c3f210e70
Merge remote-tracking branch 'origin/maint-0.2.6' into maint-0.2.7
2015-10-09 10:14:59 -04:00
Nick Mathewson
552136668c
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-10-09 10:14:46 -04:00
Nick Mathewson
3569cffe14
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-10-09 10:12:59 -04:00
Karsten Loesing
62b02a1941
Update geoip and geoip6 to the October 9 2015 database.
2015-10-09 15:27:55 +02:00
Nick Mathewson
87dee5c651
Socks->SOCKS in torrcs. Fixes 15609
2015-09-29 10:20:31 +02:00
Nick Mathewson
09e272eb1e
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-09-24 10:06:36 -04:00
Nick Mathewson
fb5a858a35
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-09-24 10:06:15 -04:00
Nick Mathewson
809217e6f3
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-09-24 10:06:00 -04:00
Karsten Loesing
8b3e0b7729
Update geoip and geoip6 to the September 3 2015 database.
2015-09-24 15:08:15 +02:00
Nick Mathewson
53fc782e49
add a README to src/config
2015-09-22 17:06:39 -04:00
teor (Tim Wilson-Brown)
b584152874
Update private ExitPolicy in man page and torrcs for 10727, formatting
...
Update the definition of the private exit policy in the man page
and torrcs. It didn't get merged correctly into the man page, and
it was incomplete in the torrcs. (Unfortunately, we only reject the
primary configured IPv4 and IPv6 addresses, not all configured IPv4
and IPv6 addresses.)
Also fixup msn page formatting errors from changes in tickets 16069
and 17027, mainly unescaped *s.
2015-09-22 12:14:27 +10:00
teor (Tim Wilson-Brown)
249e82c906
Update docs with advice for separate IPv4 and IPv6 exit policies
...
Advise users how to configure separate IPv4 and IPv6 exit
policies in the manpage and sample torrcs.
Related to fixes in ticket #16069 and #17027 . Patch by "teor".
Patch on 2eb7eafc9da96c0affcb
2015-09-22 11:41:16 +10:00
teor (Tim Wilson-Brown)
a659a3fced
Merge branch 'bug17027-reject-private-all-interfaces-v2' into bug16069-bug17027
...
src/test/test_policy.c:
Merged calls to policies_parse_exit_policy by adding additional arguments.
fixup to remaining instance of ~EXIT_POLICY_IPV6_ENABLED.
Compacting logic test now produces previous list length of 4, corrected this.
src/config/torrc.sample.in:
src/config/torrc.minimal.in-staging:
Merged torrc modification dates in favour of latest.
2015-09-16 09:09:54 +10:00
teor (Tim Wilson-Brown)
098b82c7b2
ExitPolicyRejectPrivate rejects local IPv6 address and interface addresses
...
ExitPolicyRejectPrivate now rejects more local addresses by default:
* the relay's published IPv6 address (if any), and
* any publicly routable IPv4 or IPv6 addresses on any local interfaces.
This resolves a security issue for IPv6 Exits and multihomed Exits that
trust connections originating from localhost.
Resolves ticket 17027. Patch by "teor".
Patch on 42b8fb5a15
2015-09-16 02:56:50 +10:00
teor (Tim Wilson-Brown)
d3358a0a05
ExitPolicy accept6/reject6 produces IPv6 wildcard addresses only
...
In previous versions of Tor, ExitPolicy accept6/reject6 * produced
policy entries for IPv4 and IPv6 wildcard addresses.
To reduce operator confusion, change accept6/reject6 * to only produce
an IPv6 wildcard address.
Resolves bug #16069 .
Patch on 2eb7eafc9da96c0affcb
2015-09-16 00:13:12 +10:00
Nick Mathewson
98b2a3b3d5
Increase AccountingMax example value to 40 GB.
...
(Change not made in torrc.minimal.in; only in torrc.sample and
torrc.minimal.in-staging)
Closes ticket 16742.
2015-08-14 09:54:29 -04:00
Nick Mathewson
9d86f6665a
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-07-29 10:48:13 -04:00
Nick Mathewson
01bb260f31
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-07-29 10:47:07 -04:00
Karsten Loesing
7004d67430
Update geoip and geoip6 to the July 8 2015 database.
2015-07-29 15:49:04 +02:00
Nick Mathewson
418b6f8197
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-06-25 11:43:17 -04:00
Nick Mathewson
fd082c394b
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-06-25 11:43:04 -04:00
Nick Mathewson
fde4199e1c
Merge remote-tracking branch 'karsten/geoip6-jun2015' into maint-0.2.4
2015-06-25 11:42:47 -04:00
Nick Mathewson
cb8c5c023f
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2015-06-25 11:42:31 -04:00
Karsten Loesing
08e14e1448
Update geoip6 to the June 3 2015 database.
2015-06-09 16:28:48 +02:00
Karsten Loesing
e5907e94c2
Update geoip to the June 3 2015 database.
2015-06-09 16:26:10 +02:00
Nick Mathewson
0ac748353a
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-04-27 14:18:16 -04:00
Nick Mathewson
6c7720ed49
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-04-27 14:16:55 -04:00
Nick Mathewson
efae1bcef6
Merge remote-tracking branch 'karsten/geoip6-apr2015' into maint-0.2.4
2015-04-27 14:15:58 -04:00
Nick Mathewson
609cdec112
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2015-04-27 14:15:44 -04:00
Karsten Loesing
b5f6495876
Update geoip6 to the April 8 2015 database.
2015-04-24 17:51:36 +02:00
Karsten Loesing
bcc0a48cfe
Update geoip to the April 8 2015 database.
2015-04-24 17:49:45 +02:00
Nick Mathewson
7c9be64e1a
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-03-09 16:25:11 -04:00
Nick Mathewson
306f2f0eff
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-03-09 16:24:44 -04:00
Nick Mathewson
220e9be095
Merge remote-tracking branch 'karsten/geoip6-mar2015' into maint-0.2.4
2015-03-09 16:24:07 -04:00
Nick Mathewson
5588e677bd
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2015-03-09 16:23:55 -04:00
Karsten Loesing
62714068d9
Update geoip6 to the March 3 2015 database.
2015-03-09 21:11:52 +01:00
Karsten Loesing
beda8d2934
Update geoip to the March 3 2015 database.
2015-03-09 21:09:44 +01:00
Nick Mathewson
d8517fe843
Merge remote-tracking branch 'origin/maint-0.2.5'
2015-01-23 08:53:21 -05:00
Nick Mathewson
7cbdec578b
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-01-23 08:52:55 -05:00
Nick Mathewson
df4c484021
Merge remote-tracking branch 'karsten/geoip6-jan2015' into maint-0.2.4
2015-01-23 08:52:35 -05:00
Nick Mathewson
dbd5a9a8f9
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2015-01-23 08:52:20 -05:00
Karsten Loesing
a9ce0cd659
Update geoip6 to the January 7 2015 database.
2015-01-22 09:58:29 +01:00
Karsten Loesing
c3f8f5ab0e
Update geoip to the January 7 2015 database.
2015-01-22 09:56:54 +01:00
Nick Mathewson
b4ead16d57
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-11-24 09:19:22 -05:00
Nick Mathewson
5b55778c86
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-11-24 09:19:06 -05:00
Nick Mathewson
137982f955
Merge remote-tracking branch 'karsten/geoip6-nov2014' into maint-0.2.4
2014-11-24 09:18:36 -05:00
Nick Mathewson
8d5f1e6961
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-11-24 09:18:21 -05:00
Karsten Loesing
5441c733e0
Update geoip6 to the November 15 2014 database.
2014-11-24 14:23:18 +01:00
Karsten Loesing
8611c6bccd
Update geoip to the November 15 2014 database.
2014-11-24 14:21:31 +01:00
Peter Palfrader
64f65f2359
torrc.sample: Fix units
2014-09-16 12:03:47 -04:00
Nick Mathewson
9ab35b0a2e
Use 'Bytes', not 'B', in torrc.sample.
...
Also put this change into torrc.minimal.in-staging
Closes ticket 10343
2014-09-02 19:18:21 -04:00
Magnus Nord
d0113a0c2a
Fix: typo in torrc.sample.in
2014-09-02 19:16:16 -04:00
Nick Mathewson
8a79b56ac6
Divide torrc.sample into torrc.sample and torrc.minimal
...
torrc.minimal is now the one that should change as infrequently as
possible. To schedule an change to go into it eventually, make your
change to torrc.minimal.in-sample.
torrc.sample is now the volatile one: we can change it to our hearts'
content.
Closes ticket #11144
2014-09-02 19:14:30 -04:00
Nick Mathewson
fa7ce6d3be
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-08-13 12:52:40 -04:00
Nick Mathewson
b45f0f8fb9
Merge remote-tracking branch 'karsten/geoip6-aug2014' into maint-0.2.4
2014-08-13 12:51:38 -04:00
Nick Mathewson
244ca67e47
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-08-13 12:51:27 -04:00
Karsten Loesing
6235b4769d
Update geoip6 to the August 7 2014 database.
2014-08-13 16:16:11 +02:00
Karsten Loesing
b98e3f9936
Update geoip to the August 7 2014 database.
2014-08-13 16:08:33 +02:00
Nick Mathewson
e0aa88d106
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-07-21 14:30:09 -04:00
Nick Mathewson
75501dbe4a
Merge remote-tracking branch 'karsten/geoip6-jul2014' into maint-0.2.4
2014-07-21 14:29:43 -04:00
Nick Mathewson
015f710f72
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-07-21 14:29:30 -04:00
Karsten Loesing
6345dfa1fe
Update geoip6 to the July 10 2014 database.
2014-07-18 16:31:25 +02:00
Karsten Loesing
6d5efbef22
Update geoip to the July 10 2014 database.
2014-07-18 16:28:50 +02:00
Nick Mathewson
173a1afc58
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-06-10 21:09:27 -04:00
Nick Mathewson
3bc28c4c04
Merge remote-tracking branch 'karsten/geoip6-jun2014' into maint-0.2.4
2014-06-10 21:08:12 -04:00
Nick Mathewson
ab774a8500
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-06-10 21:07:57 -04:00
Karsten Loesing
555c43cd03
Update geoip to the June 4 2014 database.
2014-06-10 21:33:52 +02:00
Karsten Loesing
40579cb6a5
Update geoip6 to the June 4 2014 database.
2014-06-10 21:32:24 +02:00
Nick Mathewson
613b0a3bc5
Merge remote-tracking branch 'karsten/geoip2regcountry'
2014-02-25 10:04:37 -05:00
Nick Mathewson
23a5921e9a
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-02-25 10:04:10 -05:00
Nick Mathewson
d7950eda2b
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-02-25 10:02:14 -05:00
Karsten Loesing
2658e70d16
Fix geoip by falling back to registered countries.
...
See 1d2179bc90
2014-02-25 13:28:34 +01:00
Karsten Loesing
1d2179bc90
Fall back to registered country if necessary.
...
When extracting geoip and geoip6 files from MaxMind's GeoLite2 Country
database, we only look at country->iso_code which is the two-character ISO
3166-1 country code of the country where MaxMind believes the end user is
located.
But if MaxMind thinks a range belongs to anonymous proxies, they don't put
anything there. Hence, we omit those ranges and resolve them all to '??'.
That's not what we want.
What we should do is first try country->iso_code, and if there's no such
key, try registered_country->iso_code which is the country in which the
ISP has registered the IP address.
In short: let's fill all A1 entries with what ARIN et. al think.
2014-02-25 13:20:04 +01:00
Karsten Loesing
5015279153
Download MaxMind's geoip file over https.
...
If the cert turns out to be invalid or if wget is otherwise unable to
verify it, it's going to return an error and not download the file for us.
Spotted by nickm.
2014-02-25 11:26:27 +01:00
Karsten Loesing
c857276bd7
Include instructions on generating geoip files.
...
Implements #10924 .
2014-02-21 19:13:33 +00:00
Nick Mathewson
9d0af78e3c
Merge remote-tracking branch 'karsten/mmdb-convert'
2014-02-15 00:08:36 -05:00
Nick Mathewson
c64b549621
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-02-15 00:07:15 -05:00
Nick Mathewson
bc58bfda70
Merge remote-tracking branch 'karsten/geoip6-feb2014' into maint-0.2.4
2014-02-15 00:06:40 -05:00
Nick Mathewson
260b3b1a19
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-02-15 00:06:25 -05:00
Nick Mathewson
405d055465
Merge remote-tracking branch 'karsten/geoip-feb2014' into maint-0.2.3
2014-02-15 00:06:01 -05:00
Karsten Loesing
f6f691df73
Update geoip6 to the February 2014 GeoIP database.
2014-02-13 19:04:51 +01:00
Karsten Loesing
436f7106b4
Exclude Teredo IPv6 prefix from geoip6.
...
The latest GeoLite2 database includes a pointer from 2001::/32 to the root
node of the IPv4 address space in the tree. We need to exclude this whole
address space from geoip6, similar to how we exclude IPv4-mapped IPv6
addresses and the 6to4 mapping subnet.
2014-02-13 18:58:21 +01:00
Karsten Loesing
26dd328891
Update to the February 2014 GeoIP database.
2014-02-08 12:09:37 +01:00
Karsten Loesing
749ead79ad
Don't zero-pad day of the month.
2014-02-08 12:03:27 +01:00
Karsten Loesing
3bea0fff79
Add script to convert GeoLite2 country databases.
...
Copied over from https://github.com/nmathewson/mmdb-convert ,
commit 52f0d43408ed3a0fe7c3b2fa7099da7f6b7c4502.
2014-02-08 11:56:54 +01:00
Karsten Loesing
becc3d5b4e
Remove script to clean up GeoLite country databases.
2014-02-08 11:56:27 +01:00
Nick Mathewson
3e3b9219ec
Merge remote-tracking branch 'karsten/geoip-manual-update-oct2013'
2013-10-11 11:17:25 -04:00
Nick Mathewson
64293135df
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-11 11:17:18 -04:00
Nick Mathewson
7ef2939e5a
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-10-11 11:16:59 -04:00
Nick Mathewson
82d8944928
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-10-11 11:16:45 -04:00
Karsten Loesing
3b0265198f
Update to the October 2013 GeoIP database.
2013-10-11 13:36:30 +02:00
Karsten Loesing
f4ef7c76f3
Modify 1 and delete 1 geoip A1 substitution.
2013-10-11 13:30:39 +02:00
Nick Mathewson
3b6c48328b
Or maybe it is 2013. Who can say?
2013-10-09 12:48:18 -04:00
Nick Mathewson
73a0bb16b9
Partially revert "Clarify who learns about ContactInfo."
...
This reverts the torrc.sample.in changes from commit
66a04a6ac3
2013-10-09 12:02:53 -04:00
Karsten Loesing
795c0f7b00
Update last modified timestamp of torrc.sample.in.
2013-10-09 17:41:05 +02:00
Nick Mathewson
882fb8383d
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-09 09:45:21 -04:00
Karsten Loesing
66a04a6ac3
Clarify who learns about ContactInfo.
...
Explicitly include bridges, and note that we archive and publish all
descriptors.
(We are not yet publishing ContactInfo lines contained in bridge
descriptors, but maybe we'll want to do that soon, so let's err on the
side of caution here.)
Related to #9854 .
2013-10-09 09:43:18 -04:00
Nick Mathewson
57859980a8
Merge remote-tracking branch 'karsten/geoip-manual-update-sep2013'
2013-09-16 12:48:49 -04:00
Nick Mathewson
3892e03cfc
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-09-16 12:48:45 -04:00
Nick Mathewson
ace95c525c
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-09-16 12:47:05 -04:00
Nick Mathewson
b46353b793
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-09-16 12:46:50 -04:00
Karsten Loesing
13d192c1d8
Update to the September 2013 GeoIP database.
2013-09-10 15:00:06 +02:00
Karsten Loesing
e7361aa40a
Remove 17 now unused manual A1 substitutions.
2013-09-10 14:56:39 +02:00
Nick Mathewson
9abbfef2f7
Merge remote-tracking branch 'karsten/geoip-manual-update-aug2013'
2013-08-12 09:47:30 -04:00
Nick Mathewson
5d706dd27a
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-08-12 09:47:17 -04:00
Nick Mathewson
3433b7ce39
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-08-12 09:45:07 -04:00
Nick Mathewson
64410cc888
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-08-12 09:44:36 -04:00
Karsten Loesing
41bf8fa889
Update to the August 2013 GeoIP database.
2013-08-12 15:26:36 +02:00
Karsten Loesing
fa62d966c9
Add 2, update 1, and remove 3 manual A1 substitutions.
2013-08-12 15:22:14 +02:00
Nick Mathewson
dd90ab4121
Merge remote-tracking branch 'karsten/geoip-manual-update-jul2013'
2013-07-08 09:23:39 -04:00
Nick Mathewson
20634fac54
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-07-08 09:23:09 -04:00
Nick Mathewson
c78c8de015
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-07-08 09:22:49 -04:00
Nick Mathewson
0b9c515870
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-07-08 09:22:00 -04:00
Karsten Loesing
2a61b0dd6b
Update to the July 2013 GeoIP database.
2013-07-08 10:21:28 +02:00
Karsten Loesing
1a43dfa603
Add 2 new manual A1 substitutions.
2013-07-08 10:14:42 +02:00
Nick Mathewson
bcdc002269
Merge remote-tracking branch 'karsten/geoip-manual-update-jun2013'
2013-06-05 11:22:48 -04:00
Nick Mathewson
7159e19ea9
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-06-05 11:22:36 -04:00
Nick Mathewson
c860a96ecb
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-06-05 11:22:19 -04:00
Nick Mathewson
fe689de084
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-06-05 11:22:02 -04:00
Karsten Loesing
d34753174e
Update to the June 2013 GeoIP database.
2013-06-05 08:43:03 +02:00
Karsten Loesing
9b233acd03
Remove 9 now unused manual A1 substitutions.
2013-06-05 08:40:39 +02:00
Nick Mathewson
826daaf726
Merge remote-tracking branch 'karsten/geoip-manual-update-may2013'
2013-05-20 12:42:36 -04:00
Nick Mathewson
c90c370ab3
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-05-20 12:37:58 -04:00
Nick Mathewson
0c2fb64d6f
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-05-20 12:37:21 -04:00
Nick Mathewson
78735f8778
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-05-20 12:34:59 -04:00
Karsten Loesing
f8053179c9
Update to the May 2013 GeoIP database.
2013-05-13 15:37:43 +02:00
Karsten Loesing
d93caf7f0a
Update GeoIP file script and manual substitutions.
...
Script changes now catch more cases when our manual substitutions need to
be updated.
Manual substitutions are updated to May 2013 database.
2013-05-13 15:35:01 +02:00
Nick Mathewson
5d4f43eb4a
Merge remote-tracking branch 'karsten/geoip-manual-update-apr2013'
2013-04-08 11:10:37 -04:00
Nick Mathewson
1bbfadfa61
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-04-08 11:10:07 -04:00
Nick Mathewson
6acf0ac285
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-04-08 11:09:50 -04:00
Nick Mathewson
9630fb917f
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-04-08 11:09:26 -04:00
Karsten Loesing
b41f03f6df
Update to the April 2013 GeoIP database.
2013-04-08 12:18:40 +02:00
Karsten Loesing
c8925550c6
Manually fix 'A1' ranges.
...
MaxMind changed twelve 'A1' ranges in their April 2013 database that the
the substitution algorithm couldn't fix. Fix them manually.
2013-04-08 12:13:12 +02:00
Nick Mathewson
d89b8e0751
Merge remote-tracking branch 'karsten/geoip-manual-update-mar2013'
2013-03-11 13:34:32 -04:00
Nick Mathewson
ef4db31693
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-03-11 13:32:16 -04:00
Nick Mathewson
c6ca199888
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-03-11 13:32:01 -04:00
Karsten Loesing
3dde6d5d29
Update to the March 2013 GeoIP database.
2013-03-07 20:58:31 +01:00
Karsten Loesing
5cad78c2ce
Manually fix yet another fourteen 'A1' ranges.
...
MaxMind added fourteen new 'A1' ranges in their March 2013 database that
the automatic substitution algorithm couldn't fix. Fix them manually.
2013-03-07 20:55:46 +01:00
Nick Mathewson
fd1c2a13e7
Merge remote-tracking branch 'karsten/geoip-manual-update'
2013-02-08 10:37:34 -05:00
Nick Mathewson
a24f29ec5d
Merge remote-tracking branch 'origin/maint-0.2.3'
2013-02-08 10:36:51 -05:00
Nick Mathewson
b840b76b04
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-02-08 10:36:34 -05:00
Karsten Loesing
7f805b6048
Comment out now obsolete change in geoip-manual.
2013-02-08 14:42:07 +01:00
Karsten Loesing
adff7f944a
Update to the February 2013 GeoIP database.
2013-02-08 14:39:25 +01:00
Nick Mathewson
cb24852ec5
Merge remote-tracking branch 'origin/maint-0.2.3'
2013-01-14 14:24:53 -05:00
Nick Mathewson
1625cddf3a
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-01-14 14:24:19 -05:00
Karsten Loesing
32114d70ae
Update to the January 2013 GeoIP database.
2013-01-05 08:18:26 +01:00
Nick Mathewson
579808d4cd
Merge remote-tracking branch 'origin/maint-0.2.3'
...
Conflicts:
src/config/geoip
2012-12-13 12:52:44 -05:00
Nick Mathewson
52bf1556b1
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2012-12-13 12:51:28 -05:00
Karsten Loesing
6bdfa295b5
Add link explaining how the geoip file was created.
2012-12-13 08:45:25 +01:00
Karsten Loesing
c9a5d613a6
Update to the December 2012 GeoIP database.
2012-12-13 08:44:30 +01:00
Karsten Loesing
d2cfd52d2c
Update to the November 2012 GeoIP database.
2012-12-13 08:44:20 +01:00
Karsten Loesing
c718921d34
Update to the December 2012 GeoIP database.
2012-12-06 11:29:47 +01:00
Karsten Loesing
35d09dd6ac
Update to the November 2012 GeoIP database.
2012-11-27 21:26:52 -05:00
Karsten Loesing
2bf195d0ce
Add script to fix "A1" entries in geoip file.
...
Fixes #6266 .
2012-11-27 21:24:07 -05:00
Nick Mathewson
b17aa28e46
Actually distribute the geoip6 file.
...
Fixes a bug (with no ticket) on 0.2.4.6-alpha.
2012-11-13 21:24:28 -05:00
Linus Nordberg
96a7313475
Update geoip6.
2012-10-17 10:54:53 +02:00
Karsten Loesing
c03e3d66a9
Minor tweaks and comments to nils' geoip v6 code.
2012-10-17 10:54:52 +02:00
nils
abb886014e
Add GeoIP database for IPv6 addresses
2012-10-17 10:54:52 +02:00
Roger Dingledine
622f90904c
4aff97cfc didn't update the 'last modified' timestamp
2012-09-22 06:11:05 -04:00
Nick Mathewson
45439bfced
Revert "6819: typo in torrc.sample.in"
...
This reverts commit 4aff97cfc7
2012-09-12 15:37:47 -04:00
Nick Mathewson
6a8861574b
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-12 11:09:10 -04:00
Nick Mathewson
4aff97cfc7
6819: typo in torrc.sample.in
2012-09-12 11:08:30 -04:00
Stewart Smith
2a4a149624
Move to non-recursive make
...
This gives us a few benefits:
1) make -j clean all
this will start working, as it should. It currently doesn't.
2) increased parallel build
recursive make will max out at number of files in a directory,
non-recursive make doesn't have such a limitation
3) Removal of duplicate information in make files,
less error prone
I've also slightly updated how we call AM_INIT_AUTOMAKE, as the way
that was used was not only deprecated but will be *removed* in the next
major automake release (1.13).... so probably best that we can continue
to bulid tor without requiring old automake.
(see http://www.gnu.org/software/automake/manual/html_node/Public-Macros.html )
For more reasons why, see resources such as:
http://miller.emu.id.au/pmiller/books/rmch/
2012-08-09 11:03:47 -04:00
Roger Dingledine
5ddb9b3134
Merge branch 'maint-0.2.2' into maint-0.2.3
2012-07-06 16:31:40 -04:00
Roger Dingledine
4e7552e552
Revert to the May 2012 geoip db
...
The June 2012 db marks too many relays as country "A1".
Addresses bug 6334.
2012-07-06 16:29:51 -04:00
Roger Dingledine
068046eebc
Merge branch 'maint-0.2.2'
2012-06-13 03:48:43 -04:00
Karsten Loesing
229abbf4bb
Update to the June 2012 GeoIP database.
...
Manually removed range 0.116.0.0 to 0.119.255.255 which Maxmind says is
assigned to AT. This is very likely a bug in their database, because
0.0.0.0/8 is a reserved range.
2012-06-13 09:21:00 +02:00
Nick Mathewson
92cba63459
Merge remote-tracking branch 'origin/maint-0.2.2'
2012-05-15 10:01:12 -04:00
Nick Mathewson
f1fca8aa4d
Remove the unused torrc.bridge.in. Bug 5622.
2012-05-14 12:37:39 -04:00
Karsten Loesing
24731ce6a7
Update to the May 2012 GeoIP database.
2012-05-07 12:50:47 +02:00
Roger Dingledine
770433f194
update the torrc.sample timestamp, and clarify socksport 0
2012-04-23 03:10:40 -04:00
Roger Dingledine
6718b6e781
Merge remote-tracking branch 'nickm/bug5438'
2012-04-23 02:03:40 -04:00
Peter Palfrader
5d7fab9477
Document unit of bandwidth related options in sample torrc.
2012-04-13 16:33:36 -04:00
Nick Mathewson
5465ac5ea3
Merge remote-tracking branch 'origin/maint-0.2.2'
2012-04-11 09:26:37 -04:00
Karsten Loesing
b395b59353
Update to the April 2012 GeoIP database.
2012-04-11 14:15:49 +02:00
Daniel 'koolfy' Faucon
116dcf6ca9
Make it clear that bridges should not be set in MyFamily
2012-04-02 18:16:13 -04:00
Nick Mathewson
548f2e32cd
Remove the deprecated FooListenAddress options from torrc.sample.in
...
Bug 5438.
2012-03-30 16:53:02 -04:00
Esteban Manchado Velázquez
2a720847ad
Fix documentation URLs in config file comments
2012-03-08 20:49:16 -05:00
Nick Mathewson
57ed8fbbdd
Merge remote-tracking branch 'origin/maint-0.2.2'
2012-03-08 10:50:33 -05:00
Nick Mathewson
9d5d3a7fd4
Merge remote-tracking branch 'karsten/geoip-march2012' into maint-0.2.2
2012-03-08 10:50:03 -05:00
Karsten Loesing
c5d7ee714f
Update to the March 2012 GeoIP database.
2012-03-08 09:35:15 +01:00
Roger Dingledine
ef0bc7f8f2
Merge branch 'maint-0.2.2'
2012-02-09 04:21:20 -05:00
Roger Dingledine
a70ff4b2cb
Merge branch 'maint-0.2.1' into maint-0.2.2
2012-02-09 04:21:08 -05:00
Roger Dingledine
6c3cffe450
revert the revert in master, since I didn't want to revert it there
2012-02-09 04:03:36 -05:00
Roger Dingledine
929ebde2b9
Merge branch 'maint-0.2.2'
2012-02-09 04:02:18 -05:00
Roger Dingledine
85c539009a
Revert "add a "docs" to the manual URI as listed in torrc.sample.in"
...
This reverts commit 55e8cae815
2012-02-09 03:57:04 -05:00
Karsten Loesing
4180624a7d
Update to the February 2012 GeoIP database.
2012-02-09 09:16:24 +01:00
Nick Mathewson
55e8cae815
add a "docs" to the manual URI as listed in torrc.sample.in
2012-02-08 10:52:05 -05:00
Roger Dingledine
9bcf315e9b
Update sample torrc file for 0.2.3.x
...
Fix broken URLs.
Tell readers about the OutboundBindAddress, ExitPolicyRejectPrivate,
and PublishServerDescriptor options.
2012-02-08 04:40:26 -05:00
Roger Dingledine
a1074c7aa2
Merge branch 'maint-0.2.1' into maint-0.2.2
2012-01-05 06:45:28 -05:00
Karsten Loesing
1db1b23a7b
Update to the January 2012 GeoIP database.
2012-01-05 11:10:57 +01:00
Roger Dingledine
0582746e0d
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-12-08 04:40:15 -05:00
Karsten Loesing
ff2c9acbb3
Update to the December 2011 GeoIP database.
2011-12-08 09:55:44 +01:00
Nick Mathewson
2b7bdc295a
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-11-14 11:10:27 -05:00
Karsten Loesing
6d45c6d548
Update to the November 2011 GeoIP database.
2011-11-07 14:23:48 +01:00
Roger Dingledine
56180d169a
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-10-13 10:14:16 -04:00
Karsten Loesing
ee545cd4cb
Update to the October 2011 GeoIP database.
2011-10-13 10:13:40 -04:00
Karsten Loesing
679f617345
Update to the September 2011 GeoIP database.
2011-09-15 16:33:36 -04:00
Karsten Loesing
d679ef623f
Update to the September 2011 GeoIP database.
2011-09-12 11:43:51 +02:00
Nick Mathewson
f570470830
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-08-08 17:21:21 -04:00
Karsten Loesing
c75ee94ab4
Update to the August 2011 GeoIP database.
2011-08-08 16:57:01 +02:00
Roger Dingledine
8e3830352f
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-07-07 13:29:02 -04:00
Roger Dingledine
51d6e95023
update to the july 2011 geoip db
2011-07-07 13:28:36 -04:00
Roger Dingledine
83e3975c8b
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-06-05 11:13:50 -04:00
Roger Dingledine
bf4b819aae
move to the june 1 2011 maxmind geoip db
2011-06-05 11:12:28 -04:00
Roger Dingledine
7206d784dc
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-05-10 23:05:51 -04:00
Roger Dingledine
e7b10e5ecf
Update to the May 1 2011 Maxmind GeoLite Country database
2011-05-10 23:04:11 -04:00
Roger Dingledine
9d2b3849b2
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-04-04 03:53:38 -04:00
Roger Dingledine
0cdd262941
switch to the apr 2011 geoip db
2011-04-04 03:52:58 -04:00
Roger Dingledine
6426cd14f3
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-03-08 18:16:06 -05:00
Roger Dingledine
d080fe8db1
move to march 2011 geoip file
2011-03-08 18:15:17 -05:00
Roger Dingledine
54ccc80a4a
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-02-07 22:20:35 -05:00
Karsten Loesing
9c2cb6fc89
Update to the February 1 2011 Maxmind GeoLite Country database.
2011-02-07 22:19:37 -05:00
Nick Mathewson
5ae391762c
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-10 14:12:33 -05:00
Karsten Loesing
d43cba6c69
Update to the January 1 2011 Maxmind GeoLite Country database.
2011-01-10 10:37:54 +01:00
Nick Mathewson
ddfb398494
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
...
Conflicts:
src/config/geoip
2010-12-14 14:13:24 -05:00
