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
0582f678e7
Merge branch 'maint-0.3.4'
2018-09-14 09:25:34 -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
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
Nick Mathewson
e8b81d7dc5
Merge branches 'bug27684' and 'bug27685'
2018-09-13 13:09:57 -04:00
Nick Mathewson
15596f6c0c
Fix a memory leak in tortls/openssl/try_to_extract_certs_from_tls
...
Since this is an "intrusive" test, it only shows up for openssl <1.1
This is a bugfix on 0.3.5.x; bug not in any released Tor.
2018-09-13 12:47:42 -04:00
Nick Mathewson
d28018ea1e
Fix a memory leak in tortls/openssl/context_new test.
...
Bugfix on 0.3.5.x; bugfix not on any released Tor.
2018-09-13 12:43:37 -04:00
cypherpunks
7c26f88fd7
rust/protover: validate unknown protocol names use only allowed characters
2018-09-13 16:33:58 +00:00
Nick Mathewson
db27a70c94
Merge branch 'ticket27547_035_01_squashed'
2018-09-13 11:48:13 -04:00
David Goulet
e7ab20710c
hs-v3: Add changes file and man page for client authorization
...
Closes #27547
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-09-13 11:47:58 -04:00
Nick Mathewson
3ddfd5ff25
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-13 11:46:04 -04:00
Nick Mathewson
8253428253
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-13 11:46:04 -04:00
Nick Mathewson
d44eb16b23
Merge branch 'maint-0.3.4'
2018-09-13 11:46:04 -04:00
Nick Mathewson
9697c2da46
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-13 11:46:04 -04:00
Nick Mathewson
c02f2d9eb4
Merge branch 'bug27658_029' into maint-0.2.9
2018-09-13 11:45:58 -04:00
David Goulet
4b646e30d8
conn: Fix memleaks in retry_all_listeners
...
Fixes #27670
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-09-12 17:51:56 -04:00
Nick Mathewson
fed2c26e60
Report UNIX connection addresses that we opened correctly.
...
This is an aside on ticket27670.
2018-09-12 17:42:24 -04:00
Nick Mathewson
f308e81fa7
Merge branch 'maint-0.3.4'
2018-09-12 17:25:40 -04:00
Nick Mathewson
f8d5fb42a3
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-12 17:24:41 -04:00
Nick Mathewson
b4f20ec8a6
Merge remote-tracking branch 'tor-github/pr/280'
2018-09-12 16:13:23 -04:00
cypherpunks
4fa46fca8e
fixup! changes file
2018-09-12 14:22:31 +00:00
Nick Mathewson
bfc847255a
Merge remote-tracking branch 'dgoulet/ticket27545_035_01'
2018-09-12 10:18:11 -04:00
cypherpunks
cb9fa3b04c
nodelist: fix docs for networkstatus_read_cached_consensus_impl
...
Fix on c12d2cb2dc
2018-09-12 14:13:03 +00:00
Nick Mathewson
0aec613a78
Add an --enable-pic option for people who hack Tor into libraries
...
Closes ticket 23846
2018-09-12 10:10:29 -04:00
cypherpunks
ab91302fd0
nodelist: use strcmpstart() instead of strncmp()
...
in rend_parse_v2_service_descriptor.
Fix on c58675ca72
2018-09-12 14:03:06 +00:00
Nick Mathewson
19dbc385d5
Merge remote-tracking branch 'tor-github/pr/298'
2018-09-12 09:38:52 -04:00
Nick Mathewson
62743912bc
Merge branch 'pr278_squashed'
2018-09-12 09:06:35 -04:00
