aboutsummaryrefslogtreecommitdiff
path: root/src/config
Commit message (Collapse)AuthorAge
...
| | * | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson2013-05-20
| | |\|
| | | * Update to the May 2013 GeoIP database.Karsten Loesing2013-05-13
| | | |
* | | | Merge remote-tracking branch 'karsten/geoip-manual-update-apr2013'Nick Mathewson2013-04-08
|\ \ \ \
| * | | | Manually fix 'A1' ranges.Karsten Loesing2013-04-08
| | | | | | | | | | | | | | | | | | | | | | | | | MaxMind changed twelve 'A1' ranges in their April 2013 database that the the substitution algorithm couldn't fix. Fix them manually.
* | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-04-08
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2013-04-08
| |\| |
| | * | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson2013-04-08
| | |\|
| | | * Update to the April 2013 GeoIP database.Karsten Loesing2013-04-08
| | | |
* | | | Merge remote-tracking branch 'karsten/geoip-manual-update-mar2013'Nick Mathewson2013-03-11
|\ \ \ \ | |/ / / |/| | |
| * | | Manually fix yet another fourteen 'A1' ranges.Karsten Loesing2013-03-07
| | | | | | | | | | | | | | | | | | | | MaxMind added fourteen new 'A1' ranges in their March 2013 database that the automatic substitution algorithm couldn't fix. Fix them manually.
* | | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2013-03-11
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson2013-03-11
| |\|
| | * Update to the March 2013 GeoIP database.Karsten Loesing2013-03-07
| | |
* | | Merge remote-tracking branch 'karsten/geoip-manual-update'Nick Mathewson2013-02-08
|\ \ \
| * | | Comment out now obsolete change in geoip-manual.Karsten Loesing2013-02-08
| | | |
* | | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2013-02-08
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson2013-02-08
| |\|
| | * Update to the February 2013 GeoIP database.Karsten Loesing2013-02-08
| | |
* | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2013-01-14
|\| |
| * | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson2013-01-14
| |\|
| | * Update to the January 2013 GeoIP database.Karsten Loesing2013-01-05
| | |
* | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-12-13
|\| | | | | | | | | | | | | | Conflicts: src/config/geoip
| * | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson2012-12-13
| |\|
| | * Add link explaining how the geoip file was created.Karsten Loesing2012-12-13
| | |
| | * Update to the December 2012 GeoIP database.Karsten Loesing2012-12-13
| | |
| | * Update to the November 2012 GeoIP database.Karsten Loesing2012-12-13
| | |
| * | Revert "6819: typo in torrc.sample.in"Nick Mathewson2012-09-12
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4aff97cfc7965414ad8506ce28a296da1bc4a161. 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.
* | | Update to the December 2012 GeoIP database.Karsten Loesing2012-12-06
| | |
* | | Update to the November 2012 GeoIP database.Karsten Loesing2012-11-27
| | |
* | | Add script to fix "A1" entries in geoip file.Karsten Loesing2012-11-27
| | | | | | | | | | | | Fixes #6266.
* | | Actually distribute the geoip6 file.Nick Mathewson2012-11-13
| | | | | | | | | | | | Fixes a bug (with no ticket) on 0.2.4.6-alpha.
* | | Update geoip6.Linus Nordberg2012-10-17
| | |
* | | Minor tweaks and comments to nils' geoip v6 code.Karsten Loesing2012-10-17
| | |
* | | Add GeoIP database for IPv6 addressesnils2012-10-17
| | |
* | | 4aff97cfc didn't update the 'last modified' timestampRoger Dingledine2012-09-22
| | |
* | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-09-12
|\| |
| * | 6819: typo in torrc.sample.inNick Mathewson2012-09-12
| | |
* | | Move to non-recursive makeStewart Smith2012-08-09
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/
* | Merge branch 'maint-0.2.2' into maint-0.2.3Roger Dingledine2012-07-06
|\|
| * Revert to the May 2012 geoip dbRoger Dingledine2012-07-06
| | | | | | | | | | The June 2012 db marks too many relays as country "A1". Addresses bug 6334.
* | Merge branch 'maint-0.2.2'Roger Dingledine2012-06-13
|\|
| * Update to the June 2012 GeoIP database.Karsten Loesing2012-06-13
| | | | | | | | | | | | 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.
* | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2012-05-15
|\|
| * Update to the May 2012 GeoIP database.Karsten Loesing2012-05-07
| |
* | Remove the unused torrc.bridge.in. Bug 5622.Nick Mathewson2012-05-14
| |
* | update the torrc.sample timestamp, and clarify socksport 0Roger Dingledine2012-04-23
| |
* | Merge remote-tracking branch 'nickm/bug5438'Roger Dingledine2012-04-23
|\ \
| * | Remove the deprecated FooListenAddress options from torrc.sample.inNick Mathewson2012-03-30
| | | | | | | | | | | | Bug 5438.
* | | Document unit of bandwidth related options in sample torrc.Peter Palfrader2012-04-13
| | |
* | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2012-04-11
|\ \ \ | | |/ | |/|