Nick Mathewson
|
98aff146d3
|
Merge branch 'maint-0.3.3'
|
2018-05-15 09:32:45 -04:00 |
|
Nick Mathewson
|
4aa3d511b2
|
Merge branch 'maint-0.3.1' into maint-0.3.2
|
2018-05-15 09:32:44 -04:00 |
|
Nick Mathewson
|
502d2c0062
|
Merge branch 'maint-0.2.9' into maint-0.3.1
|
2018-05-15 09:32:44 -04:00 |
Karsten Loesing
|
033e4723f3
|
Update geoip and geoip6 to the May 1 2018 database.
|
2018-05-15 15:20:09 +02:00 |
Marcin Cieślak
|
0c7740b7de
|
Document default value for Nickname
|
2018-04-29 13:54:56 +00:00 |
|
Nick Mathewson
|
9b10eb2d7a
|
Merge branch 'maint-0.3.1' into maint-0.3.2
|
2018-04-05 08:22:34 -04:00 |
|
Nick Mathewson
|
834eef2452
|
Merge branch 'maint-0.2.9' into maint-0.3.1
|
2018-04-05 08:22:34 -04:00 |
|
Nick Mathewson
|
b68e636b33
|
Merge branch 'maint-0.2.5' into maint-0.2.9
|
2018-04-05 08:22:33 -04:00 |
|
Karsten Loesing
|
1fa396b0a4
|
Update geoip and geoip6 to the April 3 2018 database.
|
2018-04-05 10:42:25 +02:00 |
|
Nick Mathewson
|
d60dc27555
|
Merge branch 'maint-0.3.1' into maint-0.3.2
|
2018-03-13 10:59:30 -04:00 |
|
Nick Mathewson
|
0e7f15fdb6
|
Merge branch 'maint-0.2.9' into maint-0.3.1
|
2018-03-13 10:58:02 -04:00 |
|
Nick Mathewson
|
67a313f0ec
|
Merge branch 'maint-0.2.5' into maint-0.2.9
|
2018-03-13 10:58:02 -04:00 |
|
Karsten Loesing
|
3418a3a7f0
|
Update geoip and geoip6 to the March 8 2018 database.
|
2018-03-13 10:57:49 -04:00 |
|
Nick Mathewson
|
84bc75b2e7
|
Merge branch 'maint-0.3.1' into maint-0.3.2
|
2018-02-08 10:29:06 -05:00 |
|
Nick Mathewson
|
04a8e81fa9
|
Merge branch 'maint-0.2.9' into maint-0.3.1
|
2018-02-08 10:29:05 -05:00 |
|
Nick Mathewson
|
0ddc2dc531
|
Merge branch 'maint-0.2.5' into maint-0.2.9
|
2018-02-08 10:29:05 -05:00 |
|
Karsten Loesing
|
f1278b7e57
|
Update geoip and geoip6 to the February 7 2018 database.
|
2018-02-08 10:32:41 +01:00 |
|
Nick Mathewson
|
4c651b8c04
|
Note contactinfo and myfamily as required in more places
Includes a sentence from cypherpunks; for ticket 24526.
|
2018-01-11 20:00:18 -05:00 |
|
Nick Mathewson
|
748ad2124d
|
Merge branch 'maint-0.3.1' into maint-0.3.2
|
2018-01-08 09:35:55 -05:00 |
|
Nick Mathewson
|
a1ce1ab201
|
Merge branch 'maint-0.3.0' into maint-0.3.1
|
2018-01-08 09:34:57 -05:00 |
|
Nick Mathewson
|
26e28829da
|
Merge branch 'maint-0.2.5' into maint-0.2.9
|
2018-01-08 09:34:56 -05:00 |
|
Nick Mathewson
|
8042c356f4
|
Merge branch 'maint-0.2.9' into maint-0.3.0
|
2018-01-08 09:34:56 -05:00 |
|
Karsten Loesing
|
8efbeb0982
|
Update geoip and geoip6 to the January 5 2018 database.
|
2018-01-08 11:36:38 +01:00 |
|
Nick Mathewson
|
2aa1767b25
|
Merge remote-tracking branch 'teor/bug24703_032' into maint-0.3.2
|
2018-01-02 14:42:27 -05:00 |
teor
|
a8e8ce8602
|
Bump the dates and Tor versions on the sample torrcs
|
2017-12-22 11:22:48 +11:00 |
|
teor
|
d10c2d6668
|
Clarify the OutboundBindAddressOR documentation in the sample torrc
Part of 22145
|
2017-12-22 11:22:10 +11:00 |
|
teor
|
5fb26ba2d8
|
Document IPv6Exit in the sample torrcs
Sample config-only change.
Implements 24703.
|
2017-12-22 11:10:30 +11:00 |
|
Nick Mathewson
|
5e92646715
|
Merge branch 'maint-0.3.0' into maint-0.3.1
|
2017-12-20 12:15:24 -05:00 |
|
Nick Mathewson
|
08ed0d7930
|
Merge branch 'maint-0.2.9' into maint-0.3.0
|
2017-12-20 12:15:24 -05:00 |
|
Nick Mathewson
|
c604a76a53
|
Merge branch 'maint-0.2.8' into maint-0.2.9
|
2017-12-20 12:15:23 -05:00 |
|
Nick Mathewson
|
877dd1d6c8
|
Merge branch 'maint-0.2.5' into maint-0.2.8
|
2017-12-20 12:15:23 -05:00 |
|
Karsten Loesing
|
428f8a375b
|
Update geoip and geoip6 to the December 6 2017 database.
|
2017-12-20 17:36:29 +01:00 |
|
Nick Mathewson
|
ef92511577
|
Merge branch 'maint-0.3.0' into maint-0.3.1
|
2017-11-11 12:23:34 -05:00 |
|
Nick Mathewson
|
c9b76a12f5
|
Merge branch 'maint-0.2.5' into maint-0.2.8
|
2017-11-11 12:23:33 -05:00 |
|
Nick Mathewson
|
5348c8996f
|
Merge branch 'maint-0.2.9' into maint-0.3.0
|
2017-11-11 12:23:33 -05:00 |
|
Nick Mathewson
|
9666c620d5
|
Merge branch 'maint-0.2.8' into maint-0.2.9
|
2017-11-11 12:23:33 -05:00 |
|
Karsten Loesing
|
6f8c32b7de
|
Update geoip and geoip6 to the November 6 2017 database.
|
2017-11-10 10:14:09 +01:00 |
|
Nick Mathewson
|
bdf60fc7ce
|
Merge branch 'maint-0.3.0' into maint-0.3.1
|
2017-10-05 11:03:36 -04:00 |
|
Nick Mathewson
|
d6bdec1595
|
Merge branch 'maint-0.2.5' into maint-0.2.8
|
2017-10-05 11:03:35 -04:00 |
|
Nick Mathewson
|
ad7db10770
|
Merge branch 'maint-0.2.9' into maint-0.3.0
|
2017-10-05 11:03:35 -04:00 |
|
Nick Mathewson
|
2984d99165
|
Merge branch 'maint-0.2.8' into maint-0.2.9
|
2017-10-05 11:03:35 -04:00 |
|
Karsten Loesing
|
b9d9b16b76
|
Update geoip and geoip6 to the October 4 2017 database.
|
2017-10-05 16:56:14 +02:00 |
|
Nick Mathewson
|
a9d4df9a08
|
Merge branch 'maint-0.2.9' into maint-0.3.0
|
2017-09-07 15:18:01 -04:00 |
|
Nick Mathewson
|
54fb1d0f7f
|
Merge branch 'maint-0.3.0' into maint-0.3.1
|
2017-09-07 15:18:01 -04:00 |
|
Nick Mathewson
|
bcf2b413c3
|
Merge branch 'maint-0.2.5' into maint-0.2.8
|
2017-09-07 15:18:00 -04:00 |
|
Nick Mathewson
|
08592c95fa
|
Merge branch 'maint-0.2.8' into maint-0.2.9
|
2017-09-07 15:18:00 -04:00 |
|
Karsten Loesing
|
09618ffe38
|
Update geoip and geoip6 to the September 6 2017 database.
|
2017-09-07 21:06:16 +02:00 |
|
Nick Mathewson
|
93b28972c1
|
Merge branch 'maint-0.2.5' into maint-0.2.8
|
2017-08-03 08:44:31 -04:00 |
|
Nick Mathewson
|
9696021593
|
Merge branch 'maint-0.2.8' into maint-0.2.9
|
2017-08-03 08:44:31 -04:00 |
|
Nick Mathewson
|
f33c96610f
|
Merge branch 'maint-0.2.9' into maint-0.3.0
|
2017-08-03 08:44:31 -04:00 |