fb5877b972
Merge branch 'maint-0.3.0' into maint-0.3.1
2018-01-02 10:10:28 -05:00
8a7767603a
Merge branch 'maint-0.2.9' into maint-0.3.0
2018-01-02 10:10:28 -05:00
6e5e4f92ab
Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9
2018-01-02 10:09:44 -05:00
09b9a35c07
Clear the address when we can't choose a reachable address
...
When the fascist_firewall_choose_address_ functions don't find a
reachable address, set the returned address to the null address and port.
This is a precautionary measure, because some callers do not check the
return value.
Fixes bug 24736; bugfix on 0.2.8.2-alpha.
2017-12-25 01:55:28 +11:00
08469a338a
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-21 10:50:06 -05:00
03b4dd92a4
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-21 10:49:40 -05:00
3b08184338
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-21 10:43:12 -05:00
7d845976e3
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-21 10:43:06 -05:00
9202087760
Merge branch 'bug24666_squashed_025' into maint-0.2.5
2017-12-21 10:40:10 -05:00
520cf21793
Move destroy cells into a separate queue type of their own, to save RAM
...
We've been seeing problems with destroy cells queues taking up a
huge amount of RAM. We can mitigate this, since while a full packed
destroy cell takes 514 bytes, we only need 5 bytes to remember a
circuit ID and a reason.
Fixes bug 24666. Bugfix on 0.2.5.1-alpha, when destroy cell queues
were introduced.
2017-12-21 10:29:01 -05:00
5e92646715
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-20 12:15:24 -05:00
08ed0d7930
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-20 12:15:24 -05:00
c604a76a53
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-20 12:15:23 -05:00
877dd1d6c8
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-20 12:15:23 -05:00
428f8a375b
Update geoip and geoip6 to the December 6 2017 database.
2017-12-20 17:36:29 +01:00
31ce03a2b9
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-12 09:13:12 -05:00
d3b7a2bd27
rename changes file
2017-12-12 09:13:05 -05:00
eecfed0cd2
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-11 16:56:31 -05:00
f7151387d9
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-11 16:56:31 -05:00
cdee62da9e
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-11 16:56:31 -05:00
da38904efb
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-11 16:56:31 -05:00
1deda2106b
Merge branch 'bug24167_025' into maint-0.2.5
2017-12-11 16:56:28 -05:00
eaaa1108a3
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-11 16:54:14 -05:00
04524443d0
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-11 16:54:14 -05:00
2ea573ece8
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-11 16:54:14 -05:00
bc1ea4f470
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-11 16:54:11 -05:00
f5d4bdf305
Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5
2017-12-11 16:53:02 -05:00
736e7299ce
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-11 16:51:58 -05:00
7fcb222ab7
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-11 16:51:58 -05:00
7e486dd6f7
Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9
2017-12-11 16:51:54 -05:00
f7b41bcdf0
Merge branch 'bug24086_031' into maint-0.3.1
2017-12-11 16:49:01 -05:00
828333e38c
Merge remote-tracking branch 'public/bug24099_031' into maint-0.3.1
2017-12-11 16:48:44 -05:00
d2031f2c60
Merge remote-tracking branch 'public/bug23817_031' into maint-0.3.1
2017-12-11 16:45:54 -05:00
ae608408e9
Merge remote-tracking branch 'asn/bug23862_031' into maint-0.3.1
2017-12-11 16:43:41 -05:00
c55a054236
Merge remote-tracking branch 'asn/bug23862_030' into maint-0.3.0
2017-12-11 16:41:28 -05:00
953a8f8510
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-01 12:13:40 -05:00
5c03bb7c0c
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-01 12:13:40 -05:00
3bca705c54
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-01 12:13:40 -05:00
f97f301b5b
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-01 12:13:39 -05:00
461e34bb3d
Fix a clang compilation warning in rendservice.c
...
Fixes bug 24480; bugfix on 0.2.5.16.
2017-12-01 12:13:15 -05:00
7ae9e92ffb
Add changes file for #23862 .
2017-12-01 14:14:01 +02:00
43c34dfca0
Add changes file for #23862 .
2017-12-01 14:06:36 +02:00
ee48eb1eb5
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-30 12:07:59 -05:00
5fc0587c04
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-30 12:07:59 -05:00
7e2b012b46
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-30 12:07:59 -05:00
ba4a9cf0c0
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-11-30 12:07:59 -05:00
d459c08b7d
Merge branch 'trove-2017-012_030' into maint-0.3.0
2017-11-30 12:07:43 -05:00
52d7af631c
Merge branch 'trove-2017-010_029' into maint-0.2.9
2017-11-30 12:07:26 -05:00
f49876d66e
Merge branch 'trove-2017-012_025' into maint-0.2.5
2017-11-30 12:06:21 -05:00
08ce39fb0f
Merge branch 'trove-2017-011_025' into maint-0.2.5
2017-11-30 12:06:17 -05:00
Nick Mathewson
teor
Karsten Loesing
George Kadianakis