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
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
.
The conversation from irc:
> weasel: i had intended to leave torrc.sample.in alone in maint-0.2.2,
since i don't want to make all your stable users have to deal with
a torrc change. but nickm changed it. is it in fact the case that a
change in that file means a change in the deb?
<weasel> it means you'll prompt every single user who ever touched
their torrc
<weasel> and they will be asked if they like your new version better
than what they have right now
<weasel> so it's not great
Instead I changed the website to redirect requests for the tor-manual
URL listed in maint-0.2.2's torrc.sample.in so the link will still work.
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