Nick Mathewson
d8893bc93c
Merge remote-tracking branch 'isis/bug23881_r1'
2018-03-19 17:20:37 -04:00
Nick Mathewson
910422e8fa
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-19 16:59:49 -04:00
Nick Mathewson
3716611fea
Merge branch 'maint-0.3.3'
2018-03-19 16:59:49 -04:00
Isis Lovecruft
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
Isis Lovecruft
1f8bd93ecb
rust: Fix typo in name of logged function.
2018-03-19 19:23:35 +00:00
Isis Lovecruft
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
Neel Chauhan
bc5f79b95c
Use tor_asprintf for in have_enough_mem_for_dircache()
...
(Fixes bug 20887)
2018-03-19 12:38:28 -04:00
Nick Mathewson
b0f0c0f550
Merge remote-tracking branch 'fristonio/ticket-6236'
2018-03-19 06:42:10 -04:00
Nick Mathewson
a324cd9020
Merge branch 'ticket25268_034_01'
2018-03-19 06:01:02 -04:00
Nick Mathewson
4449c9e8fe
add a changes file for 25268
2018-03-19 06:00:00 -04:00
Nick Mathewson
bc0de600b2
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-03-19 05:42:43 -04:00
Nick Mathewson
1aa0ae2cc3
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-03-19 05:42:43 -04:00
Nick Mathewson
3370b3cfef
Merge branch 'maint-0.2.5' into maint-0.2.9
2018-03-19 05:42:43 -04:00
Nick Mathewson
85719b79b7
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-19 05:42:43 -04:00
Nick Mathewson
267671bdaa
Merge branch 'maint-0.3.3'
2018-03-19 05:42:43 -04:00
Nick Mathewson
0eb2cdf99d
Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5
2018-03-19 05:42:38 -04:00
Nick Mathewson
92c60b572c
Merge branch 'maint-0.3.3'
2018-03-19 05:39:56 -04:00
Isis Lovecruft
9d1c7c3a8a
changes: Add changes file for bug25479.
2018-03-19 05:38:26 -04:00
Gisle Vanem
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
Nick Mathewson
bcea98a4b4
Merge branch 'maint-0.3.3'
2018-03-19 05:36:06 -04:00
Nick Mathewson
296e429ebc
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-19 05:36:06 -04:00
Nick Mathewson
a0cc7e9492
Merge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2
2018-03-19 05:35:39 -04:00
Nick Mathewson
5ecad6c95d
Extract the cryptographic parts of crypt_path_t and or_circuit_t.
...
Additionally, this change extracts the functions that created and
freed these elements.
These structures had common "forward&reverse stream&digest"
elements, but they were initialized and freed through cpath objects,
and different parts of the code depended on them. Now all that code
is extacted, and kept in relay_crypto.c
2018-03-17 10:59:15 -04:00
Nick Mathewson
80955be6ec
Move relay-crypto functions from relay.[ch] to relay_crypto.[ch]
...
This should help us improve modularity, and should also make it
easier for people to experiment with other relay crypto strategies
down the road.
This commit is pure function movement.
2018-03-17 10:23:44 -04:00
Nick Mathewson
320dcf65b7
Extract the crypto parts of circuit_package_relay_cell.
2018-03-17 10:16:41 -04:00
Nick Mathewson
2989326054
Rename 'relay_crypt' to 'relay_decrypt_cell'
...
This function is used upon receiving a cell, and only handles the
decrypting part. The encryption part is currently handled inside
circuit_package_relay_cell.
2018-03-17 10:05:25 -04:00
Nick Mathewson
becae4c943
Add a test for geoip_load_file().
2018-03-15 15:21:34 +01:00
Nick Mathewson
1debe57563
On geoip_free_all, reset geoip[6]_digest.
2018-03-15 15:21:23 +01:00
Nick Mathewson
ffb00404b1
Split geoip tests into a separate module.
2018-03-15 15:12:54 +01:00
Nick Mathewson
4e5e973421
Merge remote-tracking branch 'public/restart_reset_bootstrap'
2018-03-14 12:12:37 +01:00
ArunaMaurya221B
42008ee721
DisableNetwork documentation improvised
2018-03-13 21:31:10 +01:00
ArunaMaurya221B
a9203c65f1
Revised patch with 78 characters per line
2018-03-13 21:28:37 +01:00
ArunaMaurya221B
c29e66a883
PaddingStatistics documented properly
2018-03-13 21:28:36 +01:00
Nick Mathewson
bebd5809f3
Merge remote-tracking branch 'teor/rust-std'
2018-03-13 16:15:00 -04:00
Nick Mathewson
03f748d0ca
Merge branch 'maint-0.3.3'
2018-03-13 11:03:08 -04:00
Nick Mathewson
f0f2fab5e1
Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3
2018-03-13 11:02:34 -04:00
Nick Mathewson
c6d364e8ae
Merge branch 'maint-0.3.3'
2018-03-13 10:59:56 -04: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
6bc324c96a
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-13 10:59:30 -04:00
Nick Mathewson
950606dcc9
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-13 10:58:03 -04:00
Nick Mathewson
38b7885c90
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-03-13 10:58:03 -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
1047ef140e
Merge branch 'maint-0.3.3'
2018-03-13 13:41:33 +01:00
Nick Mathewson
676a28599d
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-13 13:41:24 +01:00
Nick Mathewson
094294dbb1
Merge branch 'bug25474_032' into maint-0.3.2
2018-03-13 13:41:11 +01:00
Nick Mathewson
53a807e1e9
Add a missing prototype to our libevent configure stanza.
...
Fixes bug 25474; bugfix on 0.3.2.5-alpha.
2018-03-13 13:37:26 +01:00
Nick Mathewson
40154c1f9e
Merge branch 'maint-0.3.3'
2018-03-13 10:00:58 +01:00
Nick Mathewson
e9dbd6dd8f
Update the documentation in tor_api.h
2018-03-13 10:00:41 +01:00
