aboutsummaryrefslogtreecommitdiff
path: root/src/config
AgeCommit message (Collapse)Author
2015-07-29Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6Nick Mathewson
2015-07-29Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-07-29Update geoip and geoip6 to the July 8 2015 database.Karsten Loesing
2015-06-25Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6Nick Mathewson
2015-06-25Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-06-25Merge remote-tracking branch 'karsten/geoip6-jun2015' into maint-0.2.4Nick Mathewson
2015-06-25Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2015-06-09Update geoip6 to the June 3 2015 database.Karsten Loesing
2015-06-09Update geoip to the June 3 2015 database.maint-0.2.3Karsten Loesing
2015-04-27Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6Nick Mathewson
2015-04-27Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-04-27Merge remote-tracking branch 'karsten/geoip6-apr2015' into maint-0.2.4Nick Mathewson
2015-04-27Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2015-04-24Update geoip6 to the April 8 2015 database.Karsten Loesing
2015-04-24Update geoip to the April 8 2015 database.Karsten Loesing
2015-03-09Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6Nick Mathewson
2015-03-09Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-03-09Merge remote-tracking branch 'karsten/geoip6-mar2015' into maint-0.2.4Nick Mathewson
2015-03-09Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2015-03-09Update geoip6 to the March 3 2015 database.Karsten Loesing
2015-03-09Update geoip to the March 3 2015 database.Karsten Loesing
2015-01-23Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2015-01-23Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-01-23Merge remote-tracking branch 'karsten/geoip6-jan2015' into maint-0.2.4Nick Mathewson
2015-01-23Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2015-01-22Update geoip6 to the January 7 2015 database.Karsten Loesing
2015-01-22Update geoip to the January 7 2015 database.Karsten Loesing
2014-11-24Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2014-11-24Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2014-11-24Merge remote-tracking branch 'karsten/geoip6-nov2014' into maint-0.2.4Nick Mathewson
2014-11-24Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2014-11-24Update geoip6 to the November 15 2014 database.Karsten Loesing
2014-11-24Update geoip to the November 15 2014 database.Karsten Loesing
2014-09-16torrc.sample: Fix unitsPeter Palfrader
2014-09-02Use 'Bytes', not 'B', in torrc.sample.Nick Mathewson
Also put this change into torrc.minimal.in-staging Closes ticket 10343
2014-09-02Fix: typo in torrc.sample.inMagnus Nord
2014-09-02Divide torrc.sample into torrc.sample and torrc.minimalNick Mathewson
torrc.minimal is now the one that should change as infrequently as possible. To schedule an change to go into it eventually, make your change to torrc.minimal.in-sample. torrc.sample is now the volatile one: we can change it to our hearts' content. Closes ticket #11144
2014-08-13Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2014-08-13Merge remote-tracking branch 'karsten/geoip6-aug2014' into maint-0.2.4Nick Mathewson
2014-08-13Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2014-08-13Update geoip6 to the August 7 2014 database.Karsten Loesing
2014-08-13Update geoip to the August 7 2014 database.Karsten Loesing
2014-07-21Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2014-07-21Merge remote-tracking branch 'karsten/geoip6-jul2014' into maint-0.2.4Nick Mathewson
2014-07-21Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2014-07-18Update geoip6 to the July 10 2014 database.Karsten Loesing
2014-07-18Update geoip to the July 10 2014 database.Karsten Loesing
2014-06-10Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2014-06-10Merge remote-tracking branch 'karsten/geoip6-jun2014' into maint-0.2.4Nick Mathewson
2014-06-10Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson