Nick Mathewson
e2bfffefb0
Fold changes file into changelog
2018-10-17 09:25:43 -04:00
Nick Mathewson
34cd1fc523
Merge remote-tracking branch 'tor-github/pr/406'
2018-10-16 21:33:38 -04:00
cypherpunks
2f0744b3e6
rust/tor_util: drop unsafe block in cstr!
...
This is unnecessary just to get an empty string, there's Default::default().
Fix on 8fff331bb0
.
2018-10-17 00:16:21 +00:00
Nick Mathewson
63c5e09a40
Merge remote-tracking branch 'tor-github/pr/408'
2018-10-16 19:10:05 -04:00
Nick Mathewson
e97adaf8dc
Argh. The unset value for OwningControllerFD is NOT -1.
2018-10-16 17:57:04 -04:00
Nick Mathewson
56a3cef4d7
Merge branch 'bug27849_redux'
2018-10-16 17:33:58 -04:00
Nick Mathewson
698629f5a9
Merge remote-tracking branch 'tor-github/pr/404'
2018-10-16 17:29:50 -04:00
Nick Mathewson
8a0b741487
Add a tor_free() in tor_gencert to fix a coverity warning
2018-10-16 17:18:46 -04:00
rl1987
65864be9bc
Add changes file
2018-10-16 18:04:54 +03:00
rl1987
7fd82a4570
One testcase for annotation handling in tokenize_string()
2018-10-16 18:04:54 +03:00
rl1987
f10d664fd1
Test AT_END checking in tokenize_string()
2018-10-16 18:04:54 +03:00
rl1987
1a4edceee9
Add testcase for too many elements in tokenize_string() input
2018-10-16 18:04:54 +03:00
rl1987
7c8bf2f7c7
Add testcase for too few elements in tokenize_string() input
2018-10-16 18:04:54 +03:00
rl1987
78c446af7e
Unit-test multiple line parsing with tokenize_string()
2018-10-16 18:04:54 +03:00
rl1987
81731a290d
Unit-test some error conditions in get_next_token()
2018-10-16 18:04:54 +03:00
rl1987
6c5ba2662a
Test object parsing in get_next_token()
2018-10-16 18:04:54 +03:00
rl1987
38a7033d33
Fix memory management in test_parsecommon_get_next_token_parse_keys
2018-10-16 18:04:54 +03:00
rl1987
7764d6dfc9
Test RSA private key parsing with get_next_token()
2018-10-16 18:04:54 +03:00
rl1987
569d8d8cd7
Test-case for public key parsing using get_next_token()
2018-10-16 18:04:52 +03:00
rl1987
5c891dba77
Test argument concatenation in get_next_token()
2018-10-16 18:04:20 +03:00
rl1987
7829e3a868
First testcase for get_next_token()
2018-10-16 18:04:20 +03:00
rl1987
55412c4f3d
Add new source file to test target
2018-10-16 18:04:17 +03:00
Neel Chauhan
f93ee8e4c4
Fix typo in comment for hs_cell_parse_introduce2()
2018-10-16 10:59:42 -04:00
David Goulet
b5731cdf2e
mainloop: Set client role if ControlPort is set
...
It turns out that if _only_ the ControlPort is set and nothing else, tor would
simply not bootstrap and thus not start properly. Commit 67a41b6306
removed that requirement for tor to be considered a "client".
Unfortunately, this made the mainloop enable basically nothing if only the
ControlPort is set in the torrc.
This commit now makes it that we also consider the ControlPort when deciding
if we are a Client or not. It does not revert 67a41b6306
meaning
options_any_client_port_set() stays the same, not looking at the control port.
Fixes #27849 .
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-10-16 08:11:49 -04:00
Nick Mathewson
b7fbd1f329
Merge branch 'maint-0.3.4'
2018-10-16 08:04:34 -04:00
David Goulet
38599de2dd
test: Update approx_time before the test starts
...
This way we have the same time source when the IP is created and tested later.
Fixes #27810
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-10-16 08:03:55 -04:00
Nick Mathewson
8b3ec74e5f
Merge remote-tracking branch 'public/bug27990'
2018-10-16 08:02:01 -04:00
Colin Childs
17f4388b0f
Remove mullbinde9 from fallback list
2018-10-15 13:47:31 -05:00
Nick Mathewson
11161395af
Merge branch 'maint-0.3.4'
2018-10-15 12:52:54 -04:00
Nick Mathewson
633e99575f
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-15 12:52:54 -04:00
Nick Mathewson
6b2ef2c559
Fix another tor_assert(0) case
2018-10-15 12:52:48 -04:00
Nick Mathewson
feed41bed3
Merge branch 'maint-0.3.4'
2018-10-15 12:47:46 -04:00
Nick Mathewson
d1ec7bb06e
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-15 12:47:46 -04:00
Nick Mathewson
86e0be421f
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-10-15 12:47:46 -04:00
Nick Mathewson
5b28190c67
Fix make check-spaces.
2018-10-15 12:47:19 -04:00
Colin Childs
9b946c13a2
Adding hviv104 to fallback list
2018-10-15 11:43:02 -05:00
Nick Mathewson
23ce9a60fb
Merge branch 'maint-0.3.4'
2018-10-15 10:48:35 -04:00
Nick Mathewson
3462f8ed64
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-15 10:48:35 -04:00
Nick Mathewson
796e36e535
Adjust tor_assert_unreached()
...
This version of the macro makes it obvious to the compiler that
"tor_assert_unreached()" will always abort().
2018-10-15 10:46:26 -04:00
Nick Mathewson
4983322cc7
Merge branch 'maint-0.3.4'
2018-10-15 10:37:53 -04:00
Nick Mathewson
fd528a0884
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-15 10:37:52 -04:00
Nick Mathewson
dff7d3d00a
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-10-15 10:37:49 -04:00
Nick Mathewson
b113399658
Merge branch 'bug27709_029' into maint-0.2.9
2018-10-15 10:34:39 -04:00
Nick Mathewson
5e582c7ffa
Explain a bit more about branch prediction in the unit-test case
2018-10-15 10:16:34 -04:00
rl1987
89c4a3a0b6
Write a comment to explain may_need_rebind condition
2018-10-15 16:18:31 +03:00
rl1987
9bb00a74bc
Refrain from listener rebinding when address families differ
2018-10-15 16:18:31 +03:00
Nick Mathewson
df2b46d18c
Remove a double-newline and improve a comment
2018-10-14 15:33:39 -04:00
Nick Mathewson
2dccef0eb4
Merge branch 'bug27772_squashed'
2018-10-14 15:31:52 -04:00
Nick Mathewson
6925b61cfd
Fix various GCC LTO warnings in the unit tests.
2018-10-14 15:25:16 -04:00
Nick Mathewson
7c8f20ba44
In tor_tls_get_my_certs(), set cert ptrs even on failure
...
Nothing should ever look at them on failure, but in some cases,
the unit tests don't check for failure, and then GCC-LTO freaks out.
Fixes part of 27772.
2018-10-14 15:25:16 -04:00