7f59b9fb1f
Merge branch 'maint-0.3.5'
2019-02-08 08:37:46 -05:00
ab65347819
Merge branch 'ticket29040_1_changes' into maint-0.3.5
2019-02-08 08:37:43 -05:00
b1ae2fd65b
Merge branch 'maint-0.3.5'
2019-02-08 08:19:34 -05:00
4b36f9676d
Merge remote-tracking branch 'tor-github/pr/670' into maint-0.3.5
2019-02-08 08:19:31 -05:00
bfd1d70243
Merge branch 'maint-0.3.5'
2019-02-05 08:10:43 -05:00
bca25eebfb
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-05 08:10:14 -05:00
8ea98c0f4c
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-05 08:09:47 -05:00
4d7a0a1310
Update Cargo.lock with new comment; suppress 29244.
2019-02-01 16:38:23 +01:00
790150e57a
Allow empty username/password in SOCKS5 username/password auth message
2019-01-26 11:06:33 +02:00
d9010c5b67
One more 32-bit clang warning
2019-01-24 15:23:06 -05:00
e19222a0da
Use tt_u64_op() in test_circuitpadding.c to fix compilation warnings
...
Fixes bug 29169.
2019-01-24 13:20:21 -05:00
238a9080c6
hs-v3: add an option param to safe log functions
...
We add an option param to safe_str and safe_str_client because in
some case we need to use those functions before global_options is set.
2019-01-24 04:31:18 +07:00
8de735f068
hs-v3: fix use after free in client auth config
...
We accidentally use `auth` after freeing it in
client_service_authorization_free. The way to solve it is to
free after using it.
2019-01-24 04:31:07 +07:00
adeeb8841e
Merge branch 'maint-0.3.5'
2019-01-23 11:18:14 -05:00
712a622fce
Log an HSDesc we failed to parse at Debug loglevel
2019-01-23 10:37:10 -05:00
8e1e71cc0d
Merge branch 'bug29122'
2019-01-22 14:31:01 -05:00
6243133a71
Fix intermittent failures of test_circuitpadding_wronghop().
...
We fix it by disabling the scheduling of actual padding.
Fixes #29122 .
2019-01-22 14:30:43 -05:00
21dd3ece62
Merge branch 'maint-0.3.5'
2019-01-22 11:55:56 -05:00
4159d103d6
Merge branch 'bug29042_035' into maint-0.3.5
2019-01-22 11:55:53 -05:00
761f1bf71e
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-18 12:25:08 -05:00
4cca7fb99b
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-01-18 12:25:08 -05:00
d1af4d65df
Merge branch 'maint-0.3.5'
2019-01-18 12:25:08 -05:00
a8580a6836
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-18 12:25:08 -05:00
67f275f8da
Bump to 0.4.0.1-alpha-dev
2019-01-18 10:08:57 -05:00
81f1b89efc
Better failure message on stochastic test failure
2019-01-17 17:27:13 -05:00
c08fc2e19e
Speed up the deterministic prng in test_prob_distr, by a lot.
...
Using a single xof object and squeezing it repeatedly should make
everything MUCH faster here.
2019-01-17 16:10:02 -05:00
77712a5fa2
Merge remote-tracking branch 'tor-github/pr/645'
2019-01-17 12:04:50 -05:00
16430fdaf5
Merge branch 'maint-0.3.5'
2019-01-16 14:43:53 -05:00
cbcf75d728
Update and fix a couple of comments in meminfo.c
...
This fixes a typo and also notes that HW_PHYSMEM64 is defined on
NetBSD (not just OpenBSD).
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com >
2019-01-16 14:40:15 -05:00
0f3d88a159
Use HW_PHYSMEM instead of HW_USERMEM in get_total_system_memory_impl
...
The code checked for sysctl being available and HW_PHYSMEM being
defined, but HW_USERMEM was actually being used with sysctl instead
of HW_PHYSMEM.
The case for OpenBSD, etc. use HW_PHYSMEM64 (which is obviously a
64-bit variant of HW_PHYSMEM) and the case for OSX uses HW_MEMSIZE
(which appears to be a 64-bit variant of HW_PHYSMEM).
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com >
2019-01-16 14:40:15 -05:00
0981ac4c59
Log more messages when failing to decode RSA keys
...
We log these messages at INFO level, except when we are reading a
private key from a file, in which case we log at WARN.
This fixes a regression from when we re-wrote our PEM code to be
generic between nss and openssl.
Fixes bug 29042, bugfix on 0.3.5.1-alpha.
2019-01-16 14:35:30 -05:00
2f683465d4
Bump copyright date to 2019
2019-01-16 12:33:22 -05:00
efe55b8898
Bump copyright date to 2019.
2019-01-16 12:32:32 -05:00
dd524c6335
Bump to 0.4.0.1-alpha
2019-01-16 08:32:09 -05:00
b169c8c14f
Merge remote-tracking branch 'asn-github/adaptive_padding-final'
2019-01-14 14:48:00 -05:00
691dec5d46
Merge branch 'maint-0.3.5'
2019-01-14 14:02:42 -05:00
9d9e71824c
Rework rep_hist_log_link_protocol_counts()
2019-01-14 14:01:55 -05:00
99947c3ce0
Merge remote-tracking branch 'teor/bug29015'
2019-01-14 13:59:07 -05:00
59a88b3c3a
Rename TYPE to TRANSPORT in PT STATUS messages.
...
See: https://bugs.torproject.org/28181
2019-01-14 18:35:13 +01:00
cef910642e
Merge branch 'bug28989_squashed'
2019-01-11 18:56:57 -05:00
b69d28ae83
Fix a typo
2019-01-11 18:56:48 -05:00
1bcececdd8
Fix CID 1442277
2019-01-11 18:56:48 -05:00
df1a8a657e
Actually close the stdout pipe on error in process_unix_exec
...
When cleaning up after an error in process_unix_exec, the stdin
pipe was being double closed instead of closing both the stdin
and stdout pipes. This occurred in two places.
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com >
2019-01-11 18:55:09 -05:00
d21fa48cac
Merge branch 'maint-0.3.5'
2019-01-11 18:53:24 -05:00
efd765a948
Merge remote-tracking branch 'tor-github/pr/563' into maint-0.3.5
2019-01-11 18:53:18 -05:00
5dd926caa6
Include the beginnings of a FAQ about which timer to use.
2019-01-11 09:08:51 -05:00
4dc189a904
Clarify immutability of global padding machine specs.
2019-01-11 14:41:28 +02:00
9728d3f8ac
Fix wrong bases.
2019-01-11 14:41:28 +02:00
d82a8a7f9d
Add some more type checking.
...
NOTE: This commit breaks the build, because there was a mistake in an
earlier change of exactly the sort that this is meant to detect! I'm
leaving it broken for illustration.
2019-01-11 14:41:28 +02:00
0f8253bddb
Use the distribution abstraction as an abstraction.
2019-01-11 14:40:50 +02:00
Nick Mathewson
Roger Dingledine
rl1987
Suphanat Chunhapanya
George Kadianakis
Kris Katterjohn
Alexander Færøy
Taylor R Campbell