7e75311714
Fix typo in bootstrap message
...
The message for the "ap_conn_proxy" bootstrap status tag was missing
some text. Fixes bug 28929. Bug not in any released Tor.
2019-01-04 17:27:28 -06:00
c5a216fe1b
Merge branch 'maint-0.3.5'
2019-01-04 15:04:58 -05:00
74bda3079c
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-04 15:04:58 -05:00
d7259b64d4
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-04 15:04:58 -05:00
fee2eaf2d4
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-01-04 15:04:58 -05:00
73de7b4bcb
Merge branch 'bug21394_029_redux' into maint-0.2.9
2019-01-04 15:04:54 -05:00
af85a0f28f
Remove from master those changes files that will appear in 0.3.5.7 or earlier.
2019-01-04 15:04:00 -05:00
16deb1f5f2
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-04 14:57:06 -05:00
fe3331b845
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-04 14:57:06 -05:00
a9c7830982
Merge branch 'maint-0.3.5'
2019-01-04 14:57:06 -05:00
bf8bb9c526
Merge remote-tracking branch 'dgoulet/ticket28619_033_01' into maint-0.3.3
2019-01-04 14:49:16 -05:00
fa05efdf8b
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-04 14:36:02 -05:00
94cab0d0bb
Merge branch 'maint-0.3.5'
2019-01-04 14:36:02 -05:00
d47c9276de
Merge branch 'ticket27750_034_01_squashed' into maint-0.3.4
2019-01-04 14:34:38 -05:00
98a1b8770c
Merge branch 'maint-0.3.5'
2019-01-03 21:34:43 -05:00
c75cf802d3
Merge branch 'ticket28879' into maint-0.3.5
2019-01-03 21:34:35 -05:00
7232f04939
Merge branch 'ticket28880'
2019-01-03 21:33:40 -05:00
a7cbbf279e
Merge branch 'ticket28852'
2019-01-03 21:31:08 -05:00
4e4f93d364
Add a #ifdef HAVE_UNISTD_H check to buffers.c
...
Reported on tor-dev by Gisle Vanem. Bug not in any released Tor
(The suggested patch used _MSC_VER, but that's not how we do stuff
with autoconf. With autoconf, you detect the feature you want,
rather than trying to list all the systems that do or do not have
it.)
2019-01-03 09:52:19 -05:00
9ba690e33f
Merge branch 'maint-0.3.5'
2019-01-03 09:45:56 -05:00
abdc6aede2
Merge branch 'ticket28851_035_squashed' into maint-0.3.5
2019-01-03 09:45:53 -05:00
b82717b273
Stop re-checking our hardcoded dh parameters on every startup
...
Closes ticket 28851.
2019-01-03 09:45:43 -05:00
47176eb678
Merge branch 'maint-0.3.5'
2019-01-03 09:44:15 -05:00
98736cf36a
Merge remote-tracking branch 'public/ticket28838_035' into maint-0.3.5
2019-01-03 09:44:10 -05:00
27853938a1
Merge branch 'maint-0.3.5'
2019-01-03 09:02:40 -05:00
3e64553f76
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-03 09:02:39 -05:00
ed62f0fa15
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-03 09:02:39 -05:00
1ea3127188
Merge branch 'ticket28973_033_squashed' into maint-0.3.3
2019-01-03 09:01:40 -05:00
bf413829cb
Detect openssl bug 7712 and work around it.
...
In theory it would be better to detect this bug in advance, but this
approach is much simpler, and therefore safer to backport.
This closes tor issue 28973.
2019-01-03 09:00:47 -05:00
3e7f13a4ef
Merge branch 'maint-0.3.5'
2019-01-02 16:15:39 -05:00
98755cbddf
Merge branch 'bug28974_035' into maint-0.3.5
2019-01-02 16:15:34 -05:00
eaaeaf7933
Merge branch 'maint-0.3.5'
2019-01-02 16:09:20 -05:00
a4b86421d2
ticket 28924 deserves a changes file. I made one, but I guess I forgot to git add
2019-01-02 16:09:10 -05:00
968235ce6f
Explicitly ignore check_result() result in test_voting_flags_minimal
...
Otherwise, coverity complains at is.
2019-01-02 15:45:52 -05:00
b33bcb1e63
Add an errno.h include to freespace.c to fix bug 28974.
2019-01-02 15:19:52 -05:00
c11247e957
Fix a buffer overflow in setup_cfg() in src/test/test_voting_flags.c
...
signed_descriptor_digest has a length of DIGEST_LEN but the memset
used to fill it used DIGEST256_LEN.
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com >
2018-12-23 17:46:08 -06:00
99713b176b
Merge branch 'maint-0.3.5'
2018-12-21 15:42:58 -05:00
a9eec33649
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-12-21 15:42:57 -05:00
70dd6d07bb
Merge branch 'orconn-tracker_squashed'
2018-12-21 14:22:11 -05:00
2100b35f07
changes file for ticket27167
2018-12-21 14:15:35 -05:00
f0f971409a
Add tests for bootstrap tracker
...
Part of ticket 27617.
2018-12-21 14:15:35 -05:00
85542ee5a0
The big bootstrap phase redefinition
...
Redefine the set of bootstrap phases to allow display of finer-grained
progress in the early connection stages of connecting to a relay.
This includes adding intermediate phases for proxy and PT connections.
Also add a separate new phase to indicate obtaining enough directory
info to build circuits so we can report that independently of actually
initiating an ORCONN to build the first application circuit.
Previously, we would claim to be connecting to a relay when we had
merely finished obtaining directory info.
Part of ticket 27167.
2018-12-21 14:15:35 -05:00
936c93e562
Hook up control_event_bootstrap() to btrack_orconn
...
Replace a few invocations of control_event_bootstrap() with calls from
the bootstrap tracker subsystem. This mostly leaves behavior
unchanged. The actual behavior changes come in the next commit.
Part of ticket 27167.
2018-12-21 14:15:35 -05:00
9d29abb34e
Add a comment about bto_update_best.
2018-12-21 14:15:21 -05:00
fd58e5e498
Fix priority on process subsystem level: it uses "net"
2018-12-21 14:12:20 -05:00
ab4395d082
Merge branch 'ticket28847'
2018-12-21 13:26:47 -05:00
bc836d559d
Don't initialize the process module manually in tests.
...
It's not longer needed for us to initialize the process module in tests.
See: https://bugs.torproject.org/28847
2018-12-21 13:26:38 -05:00
2322b56389
Fix typo in time_sys.h.
2018-12-21 13:26:38 -05:00
cf4b3dbd44
Use the subsystem list to initialize and shutdown process module.
...
This patch makes the process module use the subsystem list for
initializing and shutting down.
See: https://bugs.torproject.org/28847
2018-12-21 13:26:38 -05:00
9190f43b1a
Merge branch 'maint-0.3.5'
2018-12-21 11:30:58 -05:00
Taylor Yu
Nick Mathewson
Kris Katterjohn
Alexander Færøy