Nick Mathewson
112e5fa7ec
Merge branch 'maint-0.3.4'
2018-09-24 11:10:56 -04:00
Nick Mathewson
f57d8722e0
Fix the 0.3.4 part of bug 27781 (arm compilation)
...
Because with arm on OpenSSL <1.1 we don't define USE_EVP_AES_CTR, we
need to include crypto_util.h here.
2018-09-24 11:08:27 -04:00
Nick Mathewson
78295904f7
Merge branch 'ticket26744'
2018-09-24 10:56:50 -04:00
cypherpunks
b91bc1babc
rust/protover: remove redundant ExceedsMax checks
...
This is already checked elsewhere.
2018-09-24 14:30:43 +00:00
Nick Mathewson
ae0cb94b69
Initialize mainloop events earlier, since other stuff may run them.
...
Fixes a stem test failure; bugfix on c7ce6b9821
. Bug
not in any released Tor.
2018-09-22 17:40:04 -04:00
Nick Mathewson
7d9bea6a77
But, actually move systemd_watchdog_timer free into mainloop.c
2018-09-21 16:49:20 -04:00
Nick Mathewson
7eea45c5c4
Move systemd_watchdog_timer free into mainloop.c
2018-09-21 16:46:17 -04:00
Nick Mathewson
08d934b3fe
Missing include in ntmain.c
2018-09-21 16:32:14 -04:00
Nick Mathewson
169f238c23
Merge remote-tracking branch 'onionk/protover-rust1'
2018-09-21 16:28:32 -04:00
cypherpunks
5c0dd1aa90
move protover_rust.c to core/or/
...
Missed in 667a6e8fe9
.
2018-09-21 20:14:53 +00:00
Nick Mathewson
63e08f56b8
Merge remote-tracking branch 'tor-github/pr/365'
2018-09-21 16:13:59 -04:00
Nick Mathewson
7ed7fe230b
Add an include to get --disable-module-dirauth happy again
2018-09-21 15:03:42 -04:00
Nick Mathewson
b7bd162af7
Merge remote-tracking branch 'dgoulet/ticket27774_035_03'
2018-09-21 13:02:12 -04:00
Nick Mathewson
194acfb51d
Split directory.c code into several modules
...
Parts of this C file naturally belong in dircache, dirclient, and
dircommon: so, move them there.
2018-09-21 12:57:22 -04:00
David Goulet
dbc32400d5
man: Fix format typo for HiddenServiceExportCircuitID
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-09-21 09:54:22 -04:00
Nick Mathewson
0e4c42a912
Merge remote-tracking branch 'ahf-github/asn/bugs4700_2'
2018-09-21 09:40:16 -04:00
David Goulet
36be6f0d2d
fixup! hs-v3: Silence some logging for client authorization
2018-09-21 09:39:21 -04:00
Nick Mathewson
a1b0283040
Changes file for #26747
2018-09-21 09:38:51 -04:00
Nick Mathewson
9399c579e5
Merge branch 'split_mainloop_onion'
2018-09-21 09:37:23 -04:00
Nick Mathewson
9b0a17a74f
Merge branch 'maint-0.3.4'
2018-09-21 09:36:31 -04:00
Nick Mathewson
e818a71905
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-21 09:35:54 -04:00
Nick Mathewson
2cadd93cea
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-21 09:35:51 -04:00
Nick Mathewson
5b04392c15
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-21 09:35:23 -04:00
Nick Mathewson
96d1f2e6d0
Merge remote-tracking branch 'dgoulet/ticket27797_035_01'
2018-09-21 09:33:03 -04:00
Nick Mathewson
c7ce6b9821
Split main.c into main.c and mainloop.c
...
The main.c code is responsible for initialization and shutdown;
the mainloop.c code is responsible for running the main loop of Tor.
Splitting the "generic event loop" part of mainloop.c from the
event-loop-specific part is not done as part of this patch.
2018-09-21 09:14:06 -04:00
Nick Mathewson
98ef3e82e4
Move the non-crypto parts of onion.c out of src/core/crypto
...
The parts for handling cell formats should be in src/core/or.
The parts for handling onionskin queues should be in src/core/or.
Only the crypto wrapper belongs in src/core/crypto.
2018-09-21 09:14:05 -04:00
Nick Mathewson
55122bfe04
Bump to 0.3.5.2-alpha-dev
2018-09-21 09:11:33 -04:00
Alexander Færøy
03ef4ec466
Document the haproxy option of HiddenServiceExportCircuitID.
...
See: https://bugs.torproject.org/4700
2018-09-21 15:06:45 +02:00
David Goulet
49e4bda50b
fixup! hs-v3: Silence some logging for client authorization
2018-09-21 08:52:47 -04:00
David Goulet
79265a6fb6
hs-v3: Don't BUG() if the RP node_t is invalid client side
...
When sending the INTRODUCE1 cell, we acquire the needed data for the cell but
if the RP node_t has invalid data, we'll fail the send and completely kill the
SOCKS connection.
Instead, close the rendezvous circuit and return a transient error meaning
that Tor can recover by selecting a new rendezvous point. We'll also do the
same when we are unable to encode the INTRODUCE1 cell for which at that point,
we'll simply take another shot at a new rendezvous point.
Fixes #27774
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-09-21 08:44:12 -04:00
Nick Mathewson
e62d92be5a
Set a release date
2018-09-21 08:12:50 -04:00
Nick Mathewson
63219eda8a
Put dirlist_free_all back in routerlist_free_all for unit tests
2018-09-21 08:10:39 -04:00
rl1987
53d8aa1368
Add changes file
2018-09-21 10:57:41 +03:00
rl1987
d40b0e73c2
Check Python version in test_rebind.py
2018-09-21 10:57:41 +03:00
rl1987
81199eaf0e
Remove misleading first line in test_rebind.py
...
test_rebind.py actually does not require Python 3.
Bugfix on 5a11670fcaad0a58de48425ba80510effbe35628; bug not in any
Tor release.
2018-09-21 10:57:41 +03:00
cypherpunks
42558df7c8
rust/protover: return C-allocated string in protover_all_supported()
...
The result of CString::into_raw() is not safe to free
with free() except under finicky and fragile circumstances
that we definitely don't meet right now.
This was missed in be583a34a3
.
2018-09-21 05:16:22 +00:00
cypherpunks
db89b4b152
rust/protover: fix null deref in protover_all_supported()
...
Fortunately with the current callers it couldn't happen in practice.
Fix on d1820c1516
.
2018-09-21 04:57:26 +00:00
Nick Mathewson
1a85ac8c2d
Bump to 0.3.5.2-alpha
2018-09-20 16:36:07 -04:00
Nick Mathewson
de066b76a5
Start on an 0.3.5.2-alpha changelog
2018-09-20 16:35:36 -04:00
Nick Mathewson
313b67163a
changes for 27799
2018-09-20 16:30:33 -04:00
Nick Mathewson
e7ac8fabcc
Merge remote-tracking branch 'dgoulet/ticket27410_035_01'
2018-09-20 16:22:16 -04:00
Nick Mathewson
2ed0d240e8
Merge remote-tracking branch 'dgoulet/ticket27410_032_01'
2018-09-20 16:22:02 -04:00
Alexander Færøy
8ecaf41003
Support 'none' in torrc for HiddenServiceExportCircuitID.
...
See: https://bugs.torproject.org/4700
2018-09-20 20:59:42 +02:00
Nick Mathewson
813019cc57
Merge branch 'bug23512-v4-029-fixes'
2018-09-20 14:41:44 -04:00
Nick Mathewson
1da9741bca
Remove another needless typedef
2018-09-20 14:34:44 -04:00
Nick Mathewson
a406255cf3
Merge branch 'bug23512-v4-029-fixes'
2018-09-20 14:19:47 -04:00
Nick Mathewson
72e30f26ec
Fix a pair of errors in bug23512
2018-09-20 14:18:09 -04:00
Nick Mathewson
4e2028152d
Fix an NSS socket leak-on-error found by dgoulet
2018-09-20 13:53:04 -04:00
Nick Mathewson
d6c564e09a
Use the correct macro to detect an invalid socket in tortls_nss.c
...
Fixes bug 27782; bugfix on 0.3.5.1-alpha
2018-09-20 12:55:31 -04:00
Nick Mathewson
62b709bc26
Release ownership of the dummy socket that tortls_nss.c will close
...
Related to #27795 -- since NSS will close the socket, we must not
count it as owned by Tor.
2018-09-20 12:53:39 -04:00