Nick Mathewson
3f40d9ec20
Merge branch 'maint-0.3.0'
2017-06-09 09:58:46 -04: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
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
