| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | | * | | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 | Nick Mathewson | 2013-07-08 | |
| | | |\| | ||||
| | | | * | Update to the July 2013 GeoIP database. | Karsten Loesing | 2013-07-08 | |
| | | | | | ||||
| * | | | | Merge remote-tracking branch 'karsten/geoip-manual-update-jun2013' | Nick Mathewson | 2013-06-05 | |
| |\ \ \ \ | ||||
| | * | | | | Remove 9 now unused manual A1 substitutions. | Karsten Loesing | 2013-06-05 | |
| | | | | | | ||||
| * | | | | | Merge remote-tracking branch 'origin/maint-0.2.4' | Nick Mathewson | 2013-06-05 | |
| |\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | ||||
| | * | | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 | Nick Mathewson | 2013-06-05 | |
| | |\| | | ||||
| | | * | | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 | Nick Mathewson | 2013-06-05 | |
| | | |\| | ||||
| | | | * | Update to the June 2013 GeoIP database. | Karsten Loesing | 2013-06-05 | |
| | | | | | ||||
| * | | | | Merge remote-tracking branch 'karsten/geoip-manual-update-may2013' | Nick Mathewson | 2013-05-20 | |
| |\ \ \ \ | ||||
| | * | | | | Update GeoIP file script and manual substitutions. | Karsten Loesing | 2013-05-13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Script changes now catch more cases when our manual substitutions need to be updated. Manual substitutions are updated to May 2013 database. | |||
| * | | | | | Merge remote-tracking branch 'origin/maint-0.2.4' | Nick Mathewson | 2013-05-20 | |
| |\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | ||||
| | * | | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 | Nick Mathewson | 2013-05-20 | |
| | |\| | | ||||
| | | * | | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 | Nick Mathewson | 2013-05-20 | |
| | | |\| | ||||
| | | | * | Update to the May 2013 GeoIP database. | Karsten Loesing | 2013-05-13 | |
| | | | | | ||||
| * | | | | Merge remote-tracking branch 'karsten/geoip-manual-update-apr2013' | Nick Mathewson | 2013-04-08 | |
| |\ \ \ \ | ||||
| | * | | | | Manually fix 'A1' ranges. | Karsten Loesing | 2013-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 Mathewson | 2013-04-08 | |
| |\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | ||||
| | * | | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 | Nick Mathewson | 2013-04-08 | |
| | |\| | | ||||
| | | * | | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 | Nick Mathewson | 2013-04-08 | |
| | | |\| | ||||
| | | | * | Update to the April 2013 GeoIP database. | Karsten Loesing | 2013-04-08 | |
| | | | | | ||||
| * | | | | Merge remote-tracking branch 'karsten/geoip-manual-update-mar2013' | Nick Mathewson | 2013-03-11 | |
| |\ \ \ \ | |/ / / |/| | | | ||||
| | * | | | Manually fix yet another fourteen 'A1' ranges. | Karsten Loesing | 2013-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.4 | Nick Mathewson | 2013-03-11 | |
| |\ \ \ \ | |/ / / |/| / / | |/ / | ||||
| | * | | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 | Nick Mathewson | 2013-03-11 | |
| | |\| | ||||
| | | * | Update to the March 2013 GeoIP database. | Karsten Loesing | 2013-03-07 | |
| | | | | ||||
| * | | | Merge remote-tracking branch 'karsten/geoip-manual-update' | Nick Mathewson | 2013-02-08 | |
| |\ \ \ | ||||
| | * | | | Comment out now obsolete change in geoip-manual. | Karsten Loesing | 2013-02-08 | |
| | | | | | ||||
| * | | | | Merge remote-tracking branch 'origin/maint-0.2.3' | Nick Mathewson | 2013-02-08 | |
| |\ \ \ \ | |/ / / |/| / / | |/ / | ||||
| | * | | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 | Nick Mathewson | 2013-02-08 | |
| | |\| | ||||
| | | * | Update to the February 2013 GeoIP database. | Karsten Loesing | 2013-02-08 | |
| | | | | ||||
| * | | | Merge remote-tracking branch 'origin/maint-0.2.3' | Nick Mathewson | 2013-01-14 | |
| |\| | | ||||
| | * | | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 | Nick Mathewson | 2013-01-14 | |
| | |\| | ||||
| | | * | Update to the January 2013 GeoIP database. | Karsten Loesing | 2013-01-05 | |
| | | | | ||||
| * | | | Merge remote-tracking branch 'origin/maint-0.2.3' | Nick Mathewson | 2012-12-13 | |
| |\| | | | | | | | | | | | | | | Conflicts: src/config/geoip | |||
| | * | | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 | Nick Mathewson | 2012-12-13 | |
| | |\| | ||||
| | | * | Add link explaining how the geoip file was created. | Karsten Loesing | 2012-12-13 | |
| | | | | ||||
| | | * | Update to the December 2012 GeoIP database. | Karsten Loesing | 2012-12-13 | |
| | | | | ||||
| | | * | Update to the November 2012 GeoIP database. | Karsten Loesing | 2012-12-13 | |
| | | | | ||||
| | * | | Revert "6819: typo in torrc.sample.in" | Nick Mathewson | 2012-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 Loesing | 2012-12-06 | |
| | | | | ||||
| * | | | Update to the November 2012 GeoIP database. | Karsten Loesing | 2012-11-27 | |
| | | | | ||||
| * | | | Add script to fix "A1" entries in geoip file. | Karsten Loesing | 2012-11-27 | |
| | | | | | | | | | | | | | Fixes #6266. | |||
| * | | | Actually distribute the geoip6 file. | Nick Mathewson | 2012-11-13 | |
| | | | | | | | | | | | | | Fixes a bug (with no ticket) on 0.2.4.6-alpha. | |||
| * | | | Update geoip6. | Linus Nordberg | 2012-10-17 | |
| | | | | ||||
| * | | | Minor tweaks and comments to nils' geoip v6 code. | Karsten Loesing | 2012-10-17 | |
| | | | | ||||
| * | | | Add GeoIP database for IPv6 addresses | nils | 2012-10-17 | |
| | | | | ||||
| * | | | 4aff97cfc didn't update the 'last modified' timestamp | Roger Dingledine | 2012-09-22 | |
| | | | | ||||
| * | | | Merge remote-tracking branch 'origin/maint-0.2.3' | Nick Mathewson | 2012-09-12 | |
| |\| | | ||||
| | * | | 6819: typo in torrc.sample.in | Nick Mathewson | 2012-09-12 | |
| | | | | ||||
| * | | | Move to non-recursive make | Stewart Smith | 2012-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/ | |||