Nick Mathewson
0d9dc13e08
Merge remote-tracking branch 'tor-github/pr/544'
2018-12-02 19:50:04 -05:00
Nick Mathewson
8221b5d587
Merge remote-tracking branch 'tor-github/pr/559'
2018-12-02 19:38:40 -05:00
teor
90ce8d0a58
doc: remove cached-routers from the man page
...
cached-routers was removed from the code a long time ago
2018-12-03 10:22:49 +10:00
teor
612b21b8ea
comment: replace cached-routers with cached-descriptors
...
cached-routers has been gone for a long time
2018-12-03 10:19:34 +10:00
Nick Mathewson
0015d00842
Use tor_strdup() in place of malloc+strncpy+terminate.
2018-12-01 20:46:06 -05:00
Nick Mathewson
8accf71c44
Merge remote-tracking branch 'tor-github/pr/556'
2018-12-01 20:35:38 -05:00
Nick Mathewson
2b2b97484a
Merge branch 'ticket27490a_squashed'
2018-12-01 20:32:18 -05:00
Neel Chauhan
ad031b64ce
Add regression test for ClientAutoIPv6ORPort
2018-12-01 14:55:57 -05:00
Neel Chauhan
81f2828d67
In fascist_firewall_use_ipv6(), say we can use IPv6 if ClientAutoIPv6ORPort is 1
2018-12-01 14:55:57 -05:00
Neel Chauhan
822cb93cab
Add new option ClientAutoIPv6ORPort to switch between IPv4 and IPv6 OR ports
2018-12-01 14:55:57 -05:00
rl1987
009205dabe
Add changes file
2018-12-01 14:31:17 -05:00
rl1987
353d2a091d
Fix coverage build
2018-12-01 14:31:17 -05:00
rl1987
39e158db36
tor-resolve: Rework SOCKS5 response parsing with trunnel
2018-12-01 14:31:17 -05:00
rl1987
8b9d6581f6
tor-resolve: Rework SOCKS5 method negotiation client part with trunnel
2018-12-01 14:31:17 -05:00
rl1987
1051969a1d
tor-resolve: parse SOCKS4a reply
2018-12-01 14:31:17 -05:00
rl1987
d49baa77b5
Allow socks4_server_reply version to be 0 (for tor-resolve)
2018-12-01 14:31:17 -05:00
rl1987
83af6d6149
tor-resolve: Use trunnel code for SOCKS5 request generation
2018-12-01 14:31:17 -05:00
rl1987
30582b940e
tor-resolve: link tor-resolve binary with trunnel lib
2018-12-01 14:31:17 -05:00
rl1987
a2bb172225
tor-resolve: generate SOCKS4a request with trunnel
2018-12-01 14:31:17 -05:00
Nick Mathewson
701eaef980
Move net.inet.ip.random_id code to lib/net/
2018-12-01 11:36:03 -05:00
Nick Mathewson
d4d4a4b2dd
Merge remote-tracking branch 'tor-github/pr/527'
2018-12-01 11:30:53 -05:00
Nick Mathewson
c63d951e7f
Merge remote-tracking branch 'tor-github/pr/530'
2018-12-01 11:28:22 -05:00
Nick Mathewson
51d94cea33
Merge branch 'maint-0.3.5'
2018-12-01 11:26:55 -05:00
Nick Mathewson
1a97379e5e
Merge remote-tracking branch 'tor-github/pr/554' into maint-0.3.5
2018-12-01 11:26:52 -05:00
Nick Mathewson
7e9985b75a
Merge remote-tracking branch 'tor-github/pr/536'
2018-12-01 11:24:02 -05:00
Nick Mathewson
af9dc12fab
Merge branch 'maint-0.3.5'
2018-12-01 11:20:10 -05:00
Nick Mathewson
11a91ef728
Merge branch 'bug28229_diag_035' into maint-0.3.5
2018-12-01 11:20:04 -05:00
rl1987
945c4dfda0
Also log a Tor log entry when it has a substring we are waiting for
2018-12-01 11:18:03 -05:00
rl1987
4c4ed413ee
1 ms. resolution for Tor logs
2018-12-01 11:18:03 -05:00
rl1987
9bbf7ec303
Add changes file
2018-12-01 11:18:03 -05:00
rl1987
0bb25931dc
Log everything from tor down to debug loglevel
2018-12-01 11:18:03 -05:00
rl1987
320f5f30b3
In test_rebind.py, log stuff with timestamps
2018-12-01 11:18:03 -05:00
Nick Mathewson
e3a19b1c78
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-12-01 11:15:09 -05:00
Nick Mathewson
cf3f7753c3
Merge branch 'maint-0.3.5'
2018-12-01 11:15:09 -05:00
Nick Mathewson
e82023d2f7
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-12-01 11:15:09 -05:00
Taylor Yu
7685f8ad35
Use table lookup for bootstrap_status_to_string
...
It also no longer distinguishes the case of internal-only paths, which
was often wrong anyway. Closes ticket 27402.
2018-11-30 16:54:01 -06:00
Taylor Yu
1fe6507d29
Split bootstrap event reporting out of control.c
...
Part of ticket 27402.
2018-11-30 16:49:44 -06:00
Neel Chauhan
d18a167ff3
sr: Switch from tor_assert() to BUG()
...
Closes #19566
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-11-30 12:16:18 -05:00
David Goulet
a51dad4272
test: Fix a warning underflow in rend_cache/clean
...
Because the test is adding entries to the "rend_cache" directly, the
rend_cache_increment_allocation() was never called which made the
rend_cache_clean() call trigger that underflow warning:
rend_cache/clean: [forking] Nov 29 09:55:04.024 [warn] rend_cache_decrement_allocation(): Bug: Underflow in rend_cache_decrement_allocation (on Tor 0.4.0.0-alpha-dev 2240fe63feb9a8cf)
The test is still good and valid.
Fixes #28660
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-11-29 10:02:50 -05:00
rl1987
9c90bddc42
Mention --no-verify in error message
2018-11-29 11:10:48 +02:00
rl1987
7c6dc28881
Improve comment at the top
2018-11-29 11:10:30 +02:00
rl1987
e2b418bab5
Rename to pre-push.git-hook
2018-11-29 10:56:56 +02:00
Alexander Færøy
2b41b857bd
Add LD_PROCESS as log domain.
...
See: https://bugs.torproject.org/28179
2018-11-27 19:31:08 +01:00
Alexander Færøy
31b3a6577c
Add buf_flush_to_pipe() and buf_read_from_pipe().
...
This patch adds two new functions: buf_flush_to_pipe() and
buf_read_from_pipe(), which makes use of our new buf_flush_to_fd() and
buf_read_from_fd() functions.
See: https://bugs.torproject.org/28179
2018-11-27 19:31:08 +01:00
Alexander Færøy
771930b84c
Refactor buf_read_from_socket() into buf_read_from_fd().
...
This patch refactors buf_read_from_socket() into buf_read_from_fd(), and
creates a specialized function for buf_read_from_socket(), which uses
buf_read_from_fd().
See: https://bugs.torproject.org/28179
2018-11-27 19:31:08 +01:00
Alexander Færøy
c71f9df07b
Refactor buf_flush_to_socket() into buf_flush_to_fd().
...
This patch refactors buf_flush_to_socket() into buf_flush_to_fd() and
creates a specialization function for buf_flush_to_socket() that makes
use of buf_flush_to_fd().
See: https://bugs.torproject.org/28179
2018-11-27 19:31:08 +01:00
Alexander Færøy
340260281a
Refactor flush_chunk() to work on pipes as well as sockets.
...
See: https://bugs.torproject.org/28179
2018-11-27 19:31:08 +01:00
Alexander Færøy
5f26ae833e
Refactor read_to_chunk() such that it supports both pipes and sockets.
...
See: https://bugs.torproject.org/28179
2018-11-27 19:31:08 +01:00
Alexander Færøy
2a3eef4404
Remove unused int pid
member of managed_proxy_t
.
...
See: https://bugs.torproject.org/28179
2018-11-27 19:31:08 +01:00
Nick Mathewson
9c2b114b2e
Merge branch 'maint-0.3.5'
2018-11-27 12:03:50 -05:00