aboutsummaryrefslogtreecommitdiff
path: root/src/config
Commit message (Collapse)AuthorAge
* 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
|\ \ \ | | |/ | |/|
| * | Update to the April 2012 GeoIP database.Karsten Loesing2012-04-11
| | |
* | | Make it clear that bridges should not be set in MyFamilyDaniel 'koolfy' Faucon2012-04-02
| |/ |/|
* | Fix documentation URLs in config file commentsEsteban Manchado Velázquez2012-03-08
| |
* | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2012-03-08
|\|
| * Merge remote-tracking branch 'karsten/geoip-march2012' into maint-0.2.2Nick Mathewson2012-03-08
| |\
| | * Update to the March 2012 GeoIP database.Karsten Loesing2012-03-08
| | |
* | | Merge branch 'maint-0.2.2'Roger Dingledine2012-02-09
|\| |
| * | Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2012-02-09
| |\|
| | * Update to the February 2012 GeoIP database.Karsten Loesing2012-02-09
| | |
* | | revert the revert in master, since I didn't want to revert it thereRoger Dingledine2012-02-09
| | |
* | | Merge branch 'maint-0.2.2'Roger Dingledine2012-02-09
|\| |
| * | Revert "add a "docs" to the manual URI as listed in torrc.sample.in"Roger Dingledine2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 55e8cae81553678ec77ce6b8fb1bf2d5e483e0aa. 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.
| * | add a "docs" to the manual URI as listed in torrc.sample.inNick Mathewson2012-02-08
| | |
* | | Update sample torrc file for 0.2.3.xRoger Dingledine2012-02-08
|/ / | | | | | | | | | | | | Fix broken URLs. Tell readers about the OutboundBindAddress, ExitPolicyRejectPrivate, and PublishServerDescriptor options.
* | Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2012-01-05
|\|
| * Update to the January 2012 GeoIP database.Karsten Loesing2012-01-05
| |
* | Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2011-12-08
|\|
| * Update to the December 2011 GeoIP database.Karsten Loesing2011-12-08
| |
* | Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-11-14
|\|
| * Update to the November 2011 GeoIP database.Karsten Loesing2011-11-07
| |
* | Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2011-10-13
|\|
| * Update to the October 2011 GeoIP database.Karsten Loesing2011-10-13
| |
| * Update to the September 2011 GeoIP database.Karsten Loesing2011-09-15
| |
* | Update to the September 2011 GeoIP database.Karsten Loesing2011-09-12
| |
* | Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-08-08
|\|
| * Update to the August 2011 GeoIP database.Karsten Loesing2011-08-08
| |
* | Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2011-07-07
|\|
| * update to the july 2011 geoip dbRoger Dingledine2011-07-07
| |
* | Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2011-06-05
|\|
| * move to the june 1 2011 maxmind geoip dbRoger Dingledine2011-06-05
| |
* | Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2011-05-10
|\|
| * Update to the May 1 2011 Maxmind GeoLite Country databaseRoger Dingledine2011-05-10
| |
* | Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2011-04-04
|\|
| * switch to the apr 2011 geoip dbRoger Dingledine2011-04-04
| |
* | Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2011-03-08
|\|
| * move to march 2011 geoip fileRoger Dingledine2011-03-08
| |
* | Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2011-02-07
|\|