Nick Mathewson
418b6f8197
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-06-25 11:43:17 -04:00
Nick Mathewson
fd082c394b
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-06-25 11:43:04 -04:00
Nick Mathewson
fde4199e1c
Merge remote-tracking branch 'karsten/geoip6-jun2015' into maint-0.2.4
2015-06-25 11:42:47 -04:00
Nick Mathewson
cb8c5c023f
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2015-06-25 11:42:31 -04:00
Karsten Loesing
08e14e1448
Update geoip6 to the June 3 2015 database.
2015-06-09 16:28:48 +02:00
Karsten Loesing
e5907e94c2
Update geoip to the June 3 2015 database.
2015-06-09 16:26:10 +02:00
Nick Mathewson
0ac748353a
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-04-27 14:18:16 -04:00
Nick Mathewson
6c7720ed49
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-04-27 14:16:55 -04:00
Nick Mathewson
efae1bcef6
Merge remote-tracking branch 'karsten/geoip6-apr2015' into maint-0.2.4
2015-04-27 14:15:58 -04:00
Nick Mathewson
609cdec112
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2015-04-27 14:15:44 -04:00
Karsten Loesing
b5f6495876
Update geoip6 to the April 8 2015 database.
2015-04-24 17:51:36 +02:00
Karsten Loesing
bcc0a48cfe
Update geoip to the April 8 2015 database.
2015-04-24 17:49:45 +02:00
Nick Mathewson
7c9be64e1a
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-03-09 16:25:11 -04:00
Nick Mathewson
306f2f0eff
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-03-09 16:24:44 -04:00
Nick Mathewson
220e9be095
Merge remote-tracking branch 'karsten/geoip6-mar2015' into maint-0.2.4
2015-03-09 16:24:07 -04:00
Nick Mathewson
5588e677bd
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2015-03-09 16:23:55 -04:00
Karsten Loesing
62714068d9
Update geoip6 to the March 3 2015 database.
2015-03-09 21:11:52 +01:00
Karsten Loesing
beda8d2934
Update geoip to the March 3 2015 database.
2015-03-09 21:09:44 +01:00
Nick Mathewson
d8517fe843
Merge remote-tracking branch 'origin/maint-0.2.5'
2015-01-23 08:53:21 -05:00
Nick Mathewson
7cbdec578b
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-01-23 08:52:55 -05:00
Nick Mathewson
df4c484021
Merge remote-tracking branch 'karsten/geoip6-jan2015' into maint-0.2.4
2015-01-23 08:52:35 -05:00
Nick Mathewson
dbd5a9a8f9
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2015-01-23 08:52:20 -05:00
Karsten Loesing
a9ce0cd659
Update geoip6 to the January 7 2015 database.
2015-01-22 09:58:29 +01:00
Karsten Loesing
c3f8f5ab0e
Update geoip to the January 7 2015 database.
2015-01-22 09:56:54 +01:00
Nick Mathewson
b4ead16d57
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-11-24 09:19:22 -05:00
Nick Mathewson
5b55778c86
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-11-24 09:19:06 -05:00
Nick Mathewson
137982f955
Merge remote-tracking branch 'karsten/geoip6-nov2014' into maint-0.2.4
2014-11-24 09:18:36 -05:00
Nick Mathewson
8d5f1e6961
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-11-24 09:18:21 -05:00
Karsten Loesing
5441c733e0
Update geoip6 to the November 15 2014 database.
2014-11-24 14:23:18 +01:00
Karsten Loesing
8611c6bccd
Update geoip to the November 15 2014 database.
2014-11-24 14:21:31 +01:00
Peter Palfrader
64f65f2359
torrc.sample: Fix units
2014-09-16 12:03:47 -04:00
Nick Mathewson
9ab35b0a2e
Use 'Bytes', not 'B', in torrc.sample.
...
Also put this change into torrc.minimal.in-staging
Closes ticket 10343
2014-09-02 19:18:21 -04:00
Magnus Nord
d0113a0c2a
Fix: typo in torrc.sample.in
2014-09-02 19:16:16 -04:00
Nick Mathewson
8a79b56ac6
Divide torrc.sample into torrc.sample and torrc.minimal
...
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-09-02 19:14:30 -04:00
Nick Mathewson
fa7ce6d3be
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-08-13 12:52:40 -04:00
Nick Mathewson
b45f0f8fb9
Merge remote-tracking branch 'karsten/geoip6-aug2014' into maint-0.2.4
2014-08-13 12:51:38 -04:00
Nick Mathewson
244ca67e47
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-08-13 12:51:27 -04:00
Karsten Loesing
6235b4769d
Update geoip6 to the August 7 2014 database.
2014-08-13 16:16:11 +02:00
Karsten Loesing
b98e3f9936
Update geoip to the August 7 2014 database.
2014-08-13 16:08:33 +02:00
Nick Mathewson
e0aa88d106
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-07-21 14:30:09 -04:00
Nick Mathewson
75501dbe4a
Merge remote-tracking branch 'karsten/geoip6-jul2014' into maint-0.2.4
2014-07-21 14:29:43 -04:00
Nick Mathewson
015f710f72
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-07-21 14:29:30 -04:00
Karsten Loesing
6345dfa1fe
Update geoip6 to the July 10 2014 database.
2014-07-18 16:31:25 +02:00
Karsten Loesing
6d5efbef22
Update geoip to the July 10 2014 database.
2014-07-18 16:28:50 +02:00
Nick Mathewson
173a1afc58
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-06-10 21:09:27 -04:00
Nick Mathewson
3bc28c4c04
Merge remote-tracking branch 'karsten/geoip6-jun2014' into maint-0.2.4
2014-06-10 21:08:12 -04:00
Nick Mathewson
ab774a8500
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-06-10 21:07:57 -04:00
Karsten Loesing
555c43cd03
Update geoip to the June 4 2014 database.
2014-06-10 21:33:52 +02:00
Karsten Loesing
40579cb6a5
Update geoip6 to the June 4 2014 database.
2014-06-10 21:32:24 +02:00
Nick Mathewson
613b0a3bc5
Merge remote-tracking branch 'karsten/geoip2regcountry'
2014-02-25 10:04:37 -05:00
Nick Mathewson
Karsten Loesing
Peter Palfrader
Magnus Nord