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
in master for details.
"""
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: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
.
We're going to not make this change in 0.2.4, since changing
torrc.sample.in makes all the debian users do some pointless
busywork. see tor-dev discusion of 9 Oct 2013.
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
.
We don't actually want to be changing the torrc.sample on stable or
near-stable stuff, since doing so makes pointless busywork for debian
users.
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