aboutsummaryrefslogtreecommitdiff
path: root/src/config
Commit message (Expand)AuthorAge
* Revert "6819: typo in torrc.sample.in"Nick Mathewson2012-09-12
* 6819: typo in torrc.sample.inNick Mathewson2012-09-12
* Merge branch 'maint-0.2.2' into maint-0.2.3Roger Dingledine2012-07-06
|\
| * Revert to the May 2012 geoip dbRoger Dingledine2012-07-06
* | Merge branch 'maint-0.2.2'Roger Dingledine2012-06-13
|\|
| * Update to the June 2012 GeoIP database.Karsten Loesing2012-06-13
* | 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
* | | 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
| * | 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
|/ /
* | 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