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
Karsten Loesing
97c6e717b9
Update geoip and geoip6 to the April 5 2016 database.
2016-04-07 11:10:09 +02:00
Nick Mathewson
17cfdb358c
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-03-09 10:36:50 -05:00
Nick Mathewson
443dddb749
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-03-09 10:36:35 -05:00
Nick Mathewson
21f9829e79
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-03-09 10:36:20 -05:00
Karsten Loesing
8e2640b15a
Update geoip and geoip6 to the March 3 2016 database.
2016-03-04 10:56:51 +01:00
Nick Mathewson
d920cbb82c
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-02-05 08:13:35 -05:00
Nick Mathewson
44ad3be221
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-02-05 08:13:24 -05:00
Nick Mathewson
f06d9a9cef
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-02-05 08:13:13 -05:00
Karsten Loesing
d5ac79e056
Update geoip and geoip6 to the February 2 2016 database.
2016-02-04 08:53:24 +01:00
Nick Mathewson
d9b11d05e8
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-01-07 09:14:15 -08:00
Nick Mathewson
400df18688
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-01-07 09:14:05 -08:00
Nick Mathewson
ae223138fb
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-01-07 09:13:54 -08:00
Karsten Loesing
1496056c12
Update geoip and geoip6 to the January 5 2016 database.
2016-01-07 11:10:37 +01:00
Nick Mathewson
9c66afe772
Merge branch 'maint-0.2.6' into maint-0.2.7
2015-12-07 10:11:21 -05:00
Nick Mathewson
089ee13534
Merge branch 'maint-0.2.5' into maint-0.2.6
2015-12-07 10:10:44 -05:00
Nick Mathewson
e8e89fd7a1
Merge branch 'maint-0.2.4' into maint-0.2.5
2015-12-07 10:10:21 -05:00
Karsten Loesing
dbb919cf94
Update geoip and geoip6 to the December 1 2015 database.
2015-12-05 17:02:59 +01:00
Nick Mathewson
7c3f210e70
Merge remote-tracking branch 'origin/maint-0.2.6' into maint-0.2.7
2015-10-09 10:14:59 -04:00
Nick Mathewson
552136668c
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-10-09 10:14:46 -04:00
Nick Mathewson
3569cffe14
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-10-09 10:12:59 -04:00
Karsten Loesing
62b02a1941
Update geoip and geoip6 to the October 9 2015 database.
2015-10-09 15:27:55 +02:00
Nick Mathewson
87dee5c651
Socks->SOCKS in torrcs. Fixes 15609
2015-09-29 10:20:31 +02:00
Nick Mathewson
09e272eb1e
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-09-24 10:06:36 -04:00
Nick Mathewson
fb5a858a35
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-09-24 10:06:15 -04:00
Nick Mathewson
809217e6f3
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-09-24 10:06:00 -04:00
Karsten Loesing
8b3e0b7729
Update geoip and geoip6 to the September 3 2015 database.
2015-09-24 15:08:15 +02:00
Nick Mathewson
53fc782e49
add a README to src/config
2015-09-22 17:06:39 -04:00
teor (Tim Wilson-Brown)
b584152874
Update private ExitPolicy in man page and torrcs for 10727, formatting
...
Update the definition of the private exit policy in the man page
and torrcs. It didn't get merged correctly into the man page, and
it was incomplete in the torrcs. (Unfortunately, we only reject the
primary configured IPv4 and IPv6 addresses, not all configured IPv4
and IPv6 addresses.)
Also fixup msn page formatting errors from changes in tickets 16069
and 17027, mainly unescaped *s.
2015-09-22 12:14:27 +10:00
teor (Tim Wilson-Brown)
249e82c906
Update docs with advice for separate IPv4 and IPv6 exit policies
...
Advise users how to configure separate IPv4 and IPv6 exit
policies in the manpage and sample torrcs.
Related to fixes in ticket #16069 and #17027 . Patch by "teor".
Patch on 2eb7eafc9da96c0affcb
2015-09-22 11:41:16 +10:00
teor (Tim Wilson-Brown)
a659a3fced
Merge branch 'bug17027-reject-private-all-interfaces-v2' into bug16069-bug17027
...
src/test/test_policy.c:
Merged calls to policies_parse_exit_policy by adding additional arguments.
fixup to remaining instance of ~EXIT_POLICY_IPV6_ENABLED.
Compacting logic test now produces previous list length of 4, corrected this.
src/config/torrc.sample.in:
src/config/torrc.minimal.in-staging:
Merged torrc modification dates in favour of latest.
2015-09-16 09:09:54 +10:00
teor (Tim Wilson-Brown)
098b82c7b2
ExitPolicyRejectPrivate rejects local IPv6 address and interface addresses
...
ExitPolicyRejectPrivate now rejects more local addresses by default:
* the relay's published IPv6 address (if any), and
* any publicly routable IPv4 or IPv6 addresses on any local interfaces.
This resolves a security issue for IPv6 Exits and multihomed Exits that
trust connections originating from localhost.
Resolves ticket 17027. Patch by "teor".
Patch on 42b8fb5a15
2015-09-16 02:56:50 +10:00
teor (Tim Wilson-Brown)
d3358a0a05
ExitPolicy accept6/reject6 produces IPv6 wildcard addresses only
...
In previous versions of Tor, ExitPolicy accept6/reject6 * produced
policy entries for IPv4 and IPv6 wildcard addresses.
To reduce operator confusion, change accept6/reject6 * to only produce
an IPv6 wildcard address.
Resolves bug #16069 .
Patch on 2eb7eafc9da96c0affcb
2015-09-16 00:13:12 +10:00
Nick Mathewson
98b2a3b3d5
Increase AccountingMax example value to 40 GB.
...
(Change not made in torrc.minimal.in; only in torrc.sample and
torrc.minimal.in-staging)
Closes ticket 16742.
2015-08-14 09:54:29 -04:00
Nick Mathewson
9d86f6665a
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-07-29 10:48:13 -04:00
Nick Mathewson
01bb260f31
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-07-29 10:47:07 -04:00
Karsten Loesing
7004d67430
Update geoip and geoip6 to the July 8 2015 database.
2015-07-29 15:49:04 +02:00
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
