Nick Mathewson
b96e2ab341
Start a changelog for 0.3.5.1-alpha
2018-09-17 09:12:10 -04:00
Nick Mathewson
b729bc202c
Add tortls.h includes to expose critical macro. Fix #27734 .
2018-09-16 22:08:02 -04:00
Nick Mathewson
a8ac21fbb5
Don't try to link C from rust doctests for nss detection
...
This is really annoying, since we can't use cfg(test) for doctests.
2018-09-16 14:34:31 -04:00
Nick Mathewson
078debb0de
Merge branch 'bug25573-034-typefix'
2018-09-16 13:46:12 -04:00
Nick Mathewson
7fd61cf536
Fix duplicate declaration of pathbias_count_valid_cells.
2018-09-16 13:45:43 -04:00
Nick Mathewson
991bec67ee
When Tor is compiled with NSS, don't claim support for LinkAuth=1
...
Closes ticket 27288
2018-09-16 13:28:29 -04:00
Nick Mathewson
035166e7bf
Add a missing function for windows
2018-09-14 15:02:11 -04:00
Nick Mathewson
af39649aad
Explicitly ignore BIO_set_close() return val to fix #27711
2018-09-14 13:09:10 -04:00
Nick Mathewson
4bdba5fa4b
Merge branch 'maint-0.3.4'
2018-09-14 12:56:31 -04:00
Nick Mathewson
6f47734ea8
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-14 12:56:30 -04:00
Nick Mathewson
a546e07600
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-14 12:56:30 -04:00
David Goulet
0971b3ce4d
hs-v3: Don't BUG() on directory permission check failure
...
In hs_config.c, we do validate the permission of the hidden service directory
but we do not try to create it. So, in the event that the directory doesn't
exists, we end up in the loading key code path which checks for the
permission and possibly creates the directory. On failure, don't BUG() since
there is a perfectly valid use case for that function to fail.
Fixes #27335
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-09-14 12:56:26 -04:00
Nick Mathewson
6e940829cc
Merge remote-tracking branch 'dgoulet/ticket27040_035_01'
2018-09-14 12:54:13 -04:00
Nick Mathewson
79f8641ee5
Merge branch 'nss_countbytes_squashed'
2018-09-14 12:45:30 -04:00
Nick Mathewson
ac93c911ce
Allow malloc includes in tls library
2018-09-14 12:44:56 -04:00
Nick Mathewson
126819c947
Add support for lower-level byte counting with NSS
...
This is harder than with OpenSSL, since OpenSSL counts the bytes on
its own and NSS doesn't. To fix this, we need to define a new
PRFileDesc layer that has its own byte-counting support.
Closes ticket 27289.
2018-09-14 12:44:56 -04:00
David Goulet
33c99cf565
hs-v2: Demote log warning to info when we don't have a consensus
...
Fixes #27040
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-09-14 12:04:01 -04:00
Nick Mathewson
8f689e0eb2
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-14 10:48:01 -04:00
Nick Mathewson
7e406ec40f
Merge branch 'maint-0.3.4'
2018-09-14 10:48:01 -04:00
Nick Mathewson
281854bab7
If options_act() fails, restore the previous value of global_options
...
Before 0.3.3.1-alpha, we would exit() in this case immediately. But
now that we leave tor_main() more conventionally, we need to make
sure we restore things so as not to cause a double free.
Fixes bug 27708; bugfix on 0.3.3.1-alpha.
2018-09-14 10:34:45 -04:00
Nick Mathewson
0e4fcd3996
Merge branch 'nss_27664'
2018-09-14 10:24:46 -04:00
Nick Mathewson
e43ae24e7d
Merge branch 'nss_27451'
2018-09-14 10:22:38 -04:00
Nick Mathewson
dbb0abc9f1
Tweak changes file: call this a major feature.
2018-09-14 09:32:53 -04:00
Nick Mathewson
1ca03633fe
Tweak message; only log it on a relay.
2018-09-14 09:32:39 -04:00
Nick Mathewson
12320e7f3e
Merge remote-tracking branch 'neel/b21530'
2018-09-14 09:27:03 -04:00
Nick Mathewson
82b1282772
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-14 09:25:34 -04:00
Nick Mathewson
0582f678e7
Merge branch 'maint-0.3.4'
2018-09-14 09:25:34 -04:00
Nick Mathewson
84e3ada71b
Merge remote-tracking branch 'onionk/rust-protokeyword1-035'
2018-09-14 09:25:31 -04:00
Nick Mathewson
bb012d7941
Merge remote-tracking branch 'tor-github/pr/329'
2018-09-14 09:22:23 -04:00
Nick Mathewson
b67f3b751a
Merge branch 'ticket27247'
2018-09-14 09:14:12 -04:00
Nick Mathewson
88c9730817
Re-order includes to expose intptr_t to tor_api_internal.h
2018-09-14 07:11:37 -04:00
cypherpunks
bf9dc697fa
Merge branch 'rust-protokeyword1-034' into rust-protokeyword1-035
2018-09-14 02:33:59 +00:00
cypherpunks
574d59c640
Merge branch 'rust-protokeyword1' into rust-protokeyword1-034
2018-09-14 02:26:31 +00:00
Neel Chauhan
2c093c96b2
Add log message for Tor being non-exit by default
2018-09-13 21:50:06 -04:00
Nick Mathewson
d8280216c0
Include torint.h in socketpair.c for intptr_t definition.
2018-09-13 17:54:26 -04:00
Nick Mathewson
92357a07bd
Fix a 32-bit off_t/size_t warning in crypto_rsa.c
...
Bug not in any released Tor.
2018-09-13 17:49:39 -04:00
Nick Mathewson
83b8a76f0c
Fix a shadowed-global warning in geoip.c
...
Bugfix on 5ab2110eb6b4ae9082430081cb2800018cf0dcd6; bug not in any
released Tor.
2018-09-13 17:48:33 -04:00
Nick Mathewson
b943721b2a
Merge branch 'bug27224_take2_squashed'
2018-09-13 16:43:06 -04:00
rl1987
1e77376e1a
Avoid calling node_get_all_orports() from node_is_a_configured_bridge()
...
All node_get_all_orports() does is allocate and return a smartlist
with at most two tor_addr_port_t members that match ORPort's of
node configuration. This is harmful for memory efficiency, as it
allocates the same stuff every time it is called. However,
node_is_a_configured_bridge() does not need to call it, as it
already has all the information to check if there is configured
bridge for a given node.
The new code is arranged in a way that hopefully makes each succeeding
linear search through bridge_list less likely.
2018-09-13 16:38:33 -04:00
Nick Mathewson
874eca6a8c
Add a test case with a matching ip but mismatched identity.
2018-09-13 16:38:33 -04:00
rl1987
9741921094
Unit tests for ticket 27224.
...
Since this is a refactoring ticket, these tests should pass before
and after the changes are made.
2018-09-13 16:25:14 -04:00
Nick Mathewson
fae7f96e7b
Explain PIE/PIC rationale for 23846.
2018-09-13 14:53:20 -04:00
Nick Mathewson
eaf7d16826
Merge branch 'ticket23846'
2018-09-13 14:51:21 -04:00
Nick Mathewson
85aba48a66
Merge branch 'bug26470_032'
2018-09-13 13:53:42 -04:00
Mike Perry
e86593c40d
Ticket #27678 : Changes file.
2018-09-13 17:46:11 +00:00
Mike Perry
efa2075670
Ticket #27678 : Emit CIRC_BW events immediately for dropped cells.
...
We determine that a cell was dropped by inspecting CIRC_BW fields. If we did
not update the delivered or overhead fields after processing the cell, the
cell was dropped/not processed.
Also emit CIRC_BW events for cases where we decide to close the circuit in
this function, so vanguards can print messages about dropped cells in those
cases, too.
2018-09-13 17:45:45 +00:00
Mike Perry
80ffedd3ca
Control port call to emit a CIRC_BW event for a single circuit.
...
This commit only moves code. No functionality has been changed.
2018-09-13 17:44:56 +00:00
Nick Mathewson
3adef11d10
Changes file for 27186
2018-09-13 13:37:29 -04:00
Nick Mathewson
2d05500a1e
Merge remote-tracking branch 'UntoSten/inform-about-conf-includes'
2018-09-13 13:35:59 -04:00
Nick Mathewson
787da5185c
Merge remote-tracking branch 'onionk/strcmpstart1'
2018-09-13 13:30:53 -04:00