Nick Mathewson
b2470f5140
Merge branch 'maint-0.3.3'
2018-06-12 08:11:20 -04:00
Nick Mathewson
19f3868523
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-06-12 08:11:19 -04:00
Karsten Loesing
ae540569ce
Update geoip and geoip6 to the June 7 2018 database.
2018-06-11 21:58:55 +02:00
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
Nick Mathewson
e220e6e437
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-03 08:44:31 -04:00
Karsten Loesing
1280de42a4
Update geoip and geoip6 to the August 3 2017 database.
2017-08-03 10:00:54 +02:00
Nick Mathewson
4a19498edc
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-01 11:19:30 -04:00
Nick Mathewson
9d24a352c0
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-01 11:19:30 -04:00
Nick Mathewson
925ef048a9
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-08-01 11:19:29 -04:00
Nick Mathewson
a48ae2aa67
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-08-01 11:19:29 -04:00
Nick Mathewson
6862eada65
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-08-01 11:19:29 -04:00
Nick Mathewson
0bfd1c318c
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-08-01 11:19:28 -04:00
Karsten Loesing
b6acfa491e
Update geoip and geoip6 to the July 4 2017 database.
2017-07-07 16:27:54 +02:00
Nick Mathewson
493d9cd17b
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-06-09 09:58:46 -04:00
Nick Mathewson
cd7d006e08
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-06-09 09:58:46 -04:00
Nick Mathewson
3f40d9ec20
Merge branch 'maint-0.3.0'
2017-06-09 09:58:46 -04:00
Nick Mathewson
24ee8595bf
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-06-09 09:58:45 -04:00
Nick Mathewson
3913f959e3
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-06-09 09:58:45 -04:00
Nick Mathewson
325c507a09
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-06-09 09:58:45 -04:00
Karsten Loesing
104e8fa751
Update geoip and geoip6 to the June 8 2017 database.
2017-06-09 15:47:49 +02:00
Daniel Pinto
ba3a5f82f1
Add support for %include funcionality on torrc #1922
...
config_get_lines is now split into two functions:
- config_get_lines which is the same as before we had %include
- config_get_lines_include which actually processes %include
2017-05-18 23:44:16 +01:00
Nick Mathewson
f5876917aa
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-05-08 08:07:38 -04:00
Nick Mathewson
5ff0b519ec
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-05-08 08:07:32 -04:00
Nick Mathewson
71dd1d716a
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-05-08 08:07:11 -04:00
Nick Mathewson
159ddf6dde
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-05-08 08:07:04 -04:00
Nick Mathewson
68d6720452
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-05-08 08:06:59 -04:00
Karsten Loesing
5207e41ffe
Update geoip and geoip6 to the May 2 2017 database.
2017-05-08 10:09:42 +02:00
Nick Mathewson
a5b50ef25b
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-04-06 08:32:04 -04:00
Nick Mathewson
7d7770f735
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-04-06 08:31:54 -04:00
Nick Mathewson
44bc8821b1
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-04-06 08:31:23 -04:00
Nick Mathewson
21d776738c
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-04-06 08:31:18 -04:00
Nick Mathewson
a8a860e1da
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-04-06 08:31:12 -04:00
Karsten Loesing
9d7933296c
Update geoip and geoip6 to the April 4 2017 database.
2017-04-06 10:52:39 +02:00
Nick Mathewson
ded2c8c689
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-03-08 10:12:27 -05:00
Nick Mathewson
d642ceb8df
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-03-08 10:12:06 -05:00
Nick Mathewson
25c28bc2d9
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-03-08 10:11:05 -05:00
Nick Mathewson
ecc73c3c03
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-03-08 10:10:44 -05:00
Nick Mathewson
933a1e7997
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-03-08 10:10:29 -05:00
Karsten Loesing
4488c319dd
Update geoip and geoip6 to the March 7 2017 database.
2017-03-08 09:41:35 +01:00
Nick Mathewson
aec45bc0b1
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-02-17 17:10:47 -05:00
Nick Mathewson
d9827e4729
Merge branch 'maint-0.2.9'
2017-02-13 14:41:43 -05:00
Nick Mathewson
a86f95df5c
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-02-13 14:38:03 -05:00
Nick Mathewson
75fe218b16
Merge branch 'maint-0.2.6' into maint-0.2.7
2017-02-13 14:37:49 -05:00
Nick Mathewson
43c18b1b7a
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-13 14:37:42 -05:00
Nick Mathewson
124062e843
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-02-13 14:37:01 -05:00
Karsten Loesing
f6016058b4
Update geoip and geoip6 to the February 8 2017 database.
2017-02-12 15:56:31 +01:00
Nick Mathewson
e91bb84a91
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
...
maint-0.2.7-redux is an attempt to try to re-create a plausible
maint-0.2.7 branch. I've started from the tor-0.2.7.6, and then I
merged maint-0.2.6 into the branch.
This has produced 2 conflicts: one related to the
rendcommon->rendcache move, and one to the authority refactoring.
2017-02-07 09:59:12 -05:00
Nick Mathewson
81c78ec755
Outbindbindaddress variants for Exit and OR.
...
Allow separation of exit and relay traffic to different source IP
addresses (Ticket #17975 ). Written by Michael Sonntag.
2017-01-27 08:05:29 -05:00
Nick Mathewson
0809690b48
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-01-11 09:13:34 -05:00
Nick Mathewson
8c91cbb6ca
Merge branch 'maint-0.2.6' into maint-0.2.7
2017-01-11 09:12:51 -05:00
Nick Mathewson
54771bcaba
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-01-11 09:12:21 -05:00
Nick Mathewson
34fdd510ef
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-01-11 09:11:58 -05:00
Karsten Loesing
3833f67dd2
Update geoip and geoip6 to the January 4 2017 database.
2017-01-04 10:19:52 +01:00
Nick Mathewson
adaf6a422a
Merge branch 'maint-0.2.8' into maint-0.2.9
2016-12-09 08:34:24 -05:00
Nick Mathewson
b49369badd
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-12-09 08:34:12 -05:00
Nick Mathewson
3d9f8ff6a5
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-12-09 08:34:06 -05:00
Nick Mathewson
3d2d3f2b62
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-12-09 08:33:57 -05:00
Karsten Loesing
9db47e7921
Update geoip and geoip6 to the December 7 2016 database.
2016-12-09 10:23:36 +01:00
Nick Mathewson
e4ef9f7491
In torrc.sample.in, note that bandwidth must be >=75 KB.
...
Queue a corresponding change for torrc.minimal.in.
Closes ticket 20085.
2016-11-08 19:23:49 -05:00
Nick Mathewson
e4b793fe41
Merge branch 'maint-0.2.8' into maint-0.2.9
2016-11-07 09:32:00 -05:00
Nick Mathewson
f5fdf188b9
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-11-07 09:30:42 -05:00
Nick Mathewson
6c2174d44d
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-11-07 09:30:16 -05:00
Nick Mathewson
db2571be61
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-11-07 09:29:54 -05:00
Karsten Loesing
ea597832e2
Update geoip and geoip6 to the November 3 2016 database.
2016-11-07 15:05:19 +01:00
Nick Mathewson
7410adb330
Merge branch 'maint-0.2.8'
2016-10-06 09:59:49 -04:00
Nick Mathewson
ec718aa839
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-10-06 09:59:18 -04:00
Nick Mathewson
12a7298376
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-10-06 09:59:03 -04:00
Nick Mathewson
304d8f3bbb
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-10-06 09:58:54 -04:00
Karsten Loesing
1b4984f196
Update geoip and geoip6 to the October 6 2016 database.
2016-10-05 16:35:14 +02:00
Nick Mathewson
c897328fee
Merge remote-tracking branch 'samdney/ticket19209'
2016-09-12 08:58:04 -04:00
Carolin Zöbelein
87b91949f1
Add some clarifications in the comments. Bug 19209
2016-09-11 01:30:02 +02:00
Nick Mathewson
f028434a5f
Merge branch 'maint-0.2.8'
2016-09-07 13:54:21 -04:00
Nick Mathewson
11edbf4808
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-09-07 13:54:03 -04:00
Nick Mathewson
52a99cb6c1
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-09-07 13:53:53 -04:00
Nick Mathewson
e4d82da05b
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-09-07 13:53:43 -04:00
Karsten Loesing
56f95ba94d
Update geoip and geoip6 to the September 6 2016 database.
2016-09-07 11:08:04 +02:00
Nick Mathewson
a7e317927b
Merge branch 'maint-0.2.8'
2016-08-12 10:27:23 -04:00
Nick Mathewson
db372addc8
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-08-12 10:27:08 -04:00
Nick Mathewson
742ff2cddb
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-08-12 10:27:01 -04:00
Nick Mathewson
46754d6081
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-08-12 10:26:48 -04:00
Karsten Loesing
1410947351
Update geoip and geoip6 to the August 2 2016 database.
2016-08-12 11:53:38 +02:00
Roger Dingledine
81cc31d3fa
three typo fixes i found in my sandbox
2016-07-25 20:17:35 -04:00
Nick Mathewson
a31078a581
Merge branch 'maint-0.2.8'
2016-07-19 12:34:37 +02:00
Nick Mathewson
4d70ed7be0
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-07-19 12:32:14 +02:00
Nick Mathewson
210928f66a
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-07-19 12:31:54 +02:00
Nick Mathewson
d95c2809b3
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-07-19 12:31:20 +02:00
Karsten Loesing
79939c6f11
Update geoip and geoip6 to the July 6 2016 database.
2016-07-18 08:40:22 +02:00
Nick Mathewson
6a7d11f38a
Merge branch 'maint-0.2.8'
2016-06-13 10:49:24 -04:00
Nick Mathewson
80089c9e7c
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-06-13 10:48:56 -04:00
Nick Mathewson
b4bb88606e
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-06-13 10:48:48 -04:00
Nick Mathewson
f25f7b759c
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-06-13 10:48:35 -04:00
Karsten Loesing
c14c662758
Update geoip and geoip6 to the June 7 2016 database.
2016-06-12 11:35:50 +02:00
Nick Mathewson
7fa11a92d5
Merge branch 'maint-0.2.8'
2016-05-09 14:59:47 -04:00
Nick Mathewson
7fe80c2905
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-05-09 14:56:56 -04:00
Nick Mathewson
0b477bfd55
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-05-09 14:55:45 -04:00
Nick Mathewson
368146370b
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-05-09 14:55:22 -04:00
Karsten Loesing
3c2d4611ce
Update geoip and geoip6 to the May 4 2016 database.
2016-05-09 17:51:15 +02:00
Nick Mathewson
7532cd439b
When we get a bad nickname, explain what a good one is.
...
Closes #18300 ; patch from "icanhasaccount".
2016-04-07 10:54:53 -04:00
Nick Mathewson
ad4ff7a5b9
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-04-07 10:45:46 -04:00
Nick Mathewson
2ce99b9f48
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-04-07 10:45:38 -04:00
Nick Mathewson
34a51d1621
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-04-07 10:45:32 -04:00
