d9ba7db38b
Merge remote-tracking branch 'public/geoip_testing'
2018-03-22 08:43:28 -04:00
f8e53a545a
Update tor_log to libc 0.2.39 as well.
2018-03-21 17:14:15 -04:00
4e82441e4c
Merge branch 'maint-0.3.3'
2018-03-21 17:10:10 -04:00
2b31387410
Update src/ext/rust to latest master for libc update.
2018-03-21 17:09:59 -04:00
03e787e220
Merge branch 'maint-0.3.3'
2018-03-21 17:05:42 -04:00
95b78d4178
Merge branch 'bug25310_r1_033' into maint-0.3.3
2018-03-21 17:04:38 -04:00
00a473733d
maint: Update Rust libc dependency from 0.2.22 to 0.2.39.
...
Requires the update/libc-0.2.39 branch from
https://github.com/isislovecruft/tor-rust-dependencies to be merged
first.
2018-03-21 17:04:28 -04:00
9799394375
maint: Add script for vendoring/updating Rust dependencies.
...
* ADD documentation for usage both inside the script and in
doc/HACKING/CodingStandardsRust.md
* FIXES part of #25310 : https://bugs.torproject.org/25310
2018-03-21 17:04:28 -04:00
f9ccb2543d
doc: Document our current rough-draft policy on Rust dependencies.
...
* FIXES #25310 : https://bugs.torproject.org/25310
2018-03-21 17:04:04 -04:00
2c36a02bb1
Merge branch 'maint-0.3.3'
2018-03-20 12:55:46 -04:00
b069979142
Merge branch 'bug25306_032_01_squashed_v2' into maint-0.3.3
2018-03-20 12:54:51 -04:00
5804ccc907
hs-v3: BUG() on missing descriptors during rotation
...
Because of #25306 for which we are unable to reproduce nor understand how it
is possible, this commit removes the asserts() and BUG() on the missing
descriptors instead when rotating them.
This allows us to log more data on error but also to let tor recover
gracefully instead of dying.
Signed-off-by: David Goulet <dgoulet@torproject.org >
2018-03-20 12:54:05 -04:00
cae7387ef2
Merge branch 'maint-0.3.3'
2018-03-20 07:59:13 -04:00
74c767af29
Note that we require latest stable rust.
2018-03-20 07:58:29 -04:00
56ae6d8766
Merge branch 'maint-0.3.3'
2018-03-20 07:50:46 -04:00
fd36bd8971
Log information on specific compression backends in the OOM handler.
...
This patch adds some additional logging to circuits_handle_oom() to give
us more information about which specific compression backend that is
using a certain amount of memory.
See: https://bugs.torproject.org/25372
2018-03-20 07:47:19 -04:00
a08e18545a
Remove changes files already merged into 0.3.3
2018-03-20 07:26:07 -04:00
228b655935
Move rust-specific declarations outside of #else block
...
These declarations need to exist unconditionally, but they were
trapped inside an "#else /* !(defined(HAVE_SYSLOG_H)) */" block.
Fixes a travis regression caused by 23881; bug not in any released tor.
2018-03-19 19:18:23 -04:00
d8893bc93c
Merge remote-tracking branch 'isis/bug23881_r1'
2018-03-19 17:20:37 -04:00
910422e8fa
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-19 16:59:49 -04:00
3716611fea
Merge branch 'maint-0.3.3'
2018-03-19 16:59:49 -04:00
66d3120634
tests: Fix HS test against max IP lifetime.
...
* FIXES part of #25450 : https://bugs.torproject.org/25450
2018-03-19 16:59:07 -04:00
1f8bd93ecb
rust: Fix typo in name of logged function.
2018-03-19 19:23:35 +00:00
547c62840e
rust: Remove #[no_mangle]s on two constants.
...
These won't/shouldn't ever be called from C, so there's no reason to
preserve naming.
2018-03-19 19:23:34 +00:00
bc5f79b95c
Use tor_asprintf for in have_enough_mem_for_dircache()
...
(Fixes bug 20887)
2018-03-19 12:38:28 -04:00
b0f0c0f550
Merge remote-tracking branch 'fristonio/ticket-6236'
2018-03-19 06:42:10 -04:00
a324cd9020
Merge branch 'ticket25268_034_01'
2018-03-19 06:01:02 -04:00
4449c9e8fe
add a changes file for 25268
2018-03-19 06:00:00 -04:00
85719b79b7
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-19 05:42:43 -04:00
bc0de600b2
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-03-19 05:42:43 -04:00
267671bdaa
Merge branch 'maint-0.3.3'
2018-03-19 05:42:43 -04:00
1aa0ae2cc3
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-03-19 05:42:43 -04:00
3370b3cfef
Merge branch 'maint-0.2.5' into maint-0.2.9
2018-03-19 05:42:43 -04:00
0eb2cdf99d
Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5
2018-03-19 05:42:38 -04:00
92c60b572c
Merge branch 'maint-0.3.3'
2018-03-19 05:39:56 -04:00
9d1c7c3a8a
changes: Add changes file for bug25479.
2018-03-19 05:38:26 -04:00
53914f7dae
tests: Fix crash on win32 due to uninitialised mutex in bench.c.
...
Signed-off-by: Isis Lovecruft <isis@torproject.org >
2018-03-19 05:38:19 -04:00
bcea98a4b4
Merge branch 'maint-0.3.3'
2018-03-19 05:36:06 -04:00
296e429ebc
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-19 05:36:06 -04:00
a0cc7e9492
Merge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2
2018-03-19 05:35:39 -04:00
becae4c943
Add a test for geoip_load_file().
2018-03-15 15:21:34 +01:00
1debe57563
On geoip_free_all, reset geoip[6]_digest.
2018-03-15 15:21:23 +01:00
ffb00404b1
Split geoip tests into a separate module.
2018-03-15 15:12:54 +01:00
4e5e973421
Merge remote-tracking branch 'public/restart_reset_bootstrap'
2018-03-14 12:12:37 +01:00
42008ee721
DisableNetwork documentation improvised
2018-03-13 21:31:10 +01:00
a9203c65f1
Revised patch with 78 characters per line
2018-03-13 21:28:37 +01:00
c29e66a883
PaddingStatistics documented properly
2018-03-13 21:28:36 +01:00
bebd5809f3
Merge remote-tracking branch 'teor/rust-std'
2018-03-13 16:15:00 -04:00
03f748d0ca
Merge branch 'maint-0.3.3'
2018-03-13 11:03:08 -04:00
f0f2fab5e1
Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3
2018-03-13 11:02:34 -04:00
Nick Mathewson
Isis Lovecruft
David Goulet
Alexander Færøy
Neel Chauhan
Gisle Vanem
ArunaMaurya221B