672c72d7d7
Merge branch 'release-0.4.0' of git-rw.torproject.org:/tor into release-0.4.0
2019-04-30 15:52:39 -04:00
955d73d1e9
Fold changes entries into releasenotes and changelog
2019-04-30 15:49:26 -04:00
603074ea18
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-30 19:26:30 +03:00
e1d4e2badb
Merge branch 'tor-github/pr/978' into maint-0.4.0
2019-04-30 19:26:14 +03:00
83f10c77da
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-29 10:15:11 -04:00
593d29920e
Merge remote-tracking branch 'tor-github/pr/974' into maint-0.4.0
2019-04-29 10:15:03 -04:00
88d6c2568d
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-25 15:47:07 +03:00
a39789a02c
Merge branch 'tor-github/pr/960' into maint-0.4.0
2019-04-25 15:46:45 +03:00
0429072495
Lower log level of unlink() errors in networkstatus_set_current_consensus().
...
In this patch we lower the log level of the failures for the three calls
to unlink() in networkstatus_set_current_consensus(). These errors might
trigger on Windows because the memory mapped consensus file keeps the
file in open state even after we have close()'d it. Windows will then
error on the unlink() call with a "Permission denied" error.
The consequences of ignoring these errors is that we leave an unused
file around on the file-system, which is an easier way to fix this
problem right now than refactoring networkstatus_set_current_consensus().
See: https://bugs.torproject.org/29930
2019-04-25 01:59:37 +02:00
1788343aff
Stop looking for scripts in the build directory during "make shellcheck"
...
Fixes bug 30263; bugfix on 0.4.0.1-alpha.
2019-04-23 12:31:14 +10:00
3444371dd9
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-18 13:22:23 +03:00
6a179b1072
Merge branch 'tor-github/pr/891' into maint-0.4.0
2019-04-18 13:21:59 +03:00
ba15b2f238
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-17 16:46:44 +10:00
c72f0cd5c7
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-04-17 16:46:40 +10:00
37d7daa3cd
changes: update the changes file for 30001
2019-04-17 12:34:33 +10:00
6b8d01693a
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-15 13:56:48 +03:00
15591e1bbd
Merge branch 'tor-github/pr/948' into maint-0.4.0
2019-04-15 13:56:37 +03:00
1177818c32
Merge branch 'rust-panic1-035' into rust-panic1-040
2019-04-15 10:18:59 +10:00
a6d0420f7c
Merge branch 'rust-panic1-034' into rust-panic1-035
...
Trivial merge: a blank line was removed between 0.3.4 and 0.3.5.
2019-04-15 10:18:01 +10:00
5ab5c8ec15
Merge branch 'rust-panic1' into rust-panic1-034
2019-04-15 10:15:02 +10:00
8ff6ab0a39
changes: file for 30117
2019-04-12 08:38:30 -04:00
594cc1de30
Start a changelog for 0.4.0.4-rc
2019-04-10 11:41:49 -04:00
bfdbc0ccd7
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-10 11:31:44 -04:00
412bcc5b2a
Merge remote-tracking branch 'tor-github/pr/926' into maint-0.4.0
2019-04-10 11:31:33 -04:00
2cdc6b2005
Add changes file for #30040 .
2019-04-10 12:46:27 +03:00
e9b3b5c3fc
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-10 18:27:07 +10:00
454bdb22ee
Merge remote-tracking branch 'tor-github/pr/920' into maint-0.4.0
2019-04-10 18:26:49 +10:00
c24928dd8f
Changes file for bug30041
2019-04-09 12:05:33 -04:00
91ff811ad1
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-09 12:25:18 +03:00
c7cf49dc3c
Merge branch 'tor-github/pr/915' into maint-0.4.0
2019-04-09 12:24:52 +03:00
2fd02c82ed
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-09 11:36:55 +10:00
92e8bdf296
Merge remote-tracking branch 'tor-github/pr/892' into maint-0.4.0
2019-04-09 11:35:41 +10:00
61e6b217c5
manpage: Clarify that Tor does stream isolation between *Port listeners by default
...
cherry-pick of tor-github/pr/841 to maint-0.4.0.
2019-04-09 11:34:51 +10:00
a63bd87760
Detect and suppress an additional gmtime() warning in test_util.c
...
Fixes bug 29922; bugfix on 0.2.9.3-alpha when we tried to capture
all these warnings. No need to backport any farther than 0.3.5,
though -- these warnings don't cause test failures before then.
This one was tricky to find because apparently it only happened on
_some_ windows builds.
2019-04-08 17:02:14 -04:00
a51f5b9b36
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-06 12:16:01 +10:00
b100c9e980
Merge remote-tracking branch 'tor-github/pr/911' into maint-0.4.0
2019-04-06 12:15:41 +10:00
4dd96f7444
changes: Ticket 29241 is actually a bug on NSS in 0.3.5.1-alpha
2019-04-06 11:07:20 +10:00
5cb94cbf9d
NSS: disable TLS1.2 SHA-384 ciphersuites.
...
In current NSS versions, these ciphersuites don't work with
SSL_ExportKeyingMaterial(), which was causing relays to fail when
they tried to negotiate the v3 link protocol authentication.
Fixes bug 29241; bugfix on 0.4.0.1-alpha.
2019-04-06 11:06:34 +10:00
680fd3f8fb
NSS: Log an error message when SSL_ExportKeyingMaterial() fails
...
Diagnostic for 29241.
2019-04-06 11:06:22 +10:00
48e990359b
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-04-06 09:33:11 +10:00
316aed502e
Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5
2019-04-06 09:32:53 +10:00
ea5e371822
Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5
2019-04-06 09:31:52 +10:00
44ea341117
Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5
2019-04-06 09:30:52 +10:00
102178e6d4
Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4
2019-04-06 09:30:04 +10:00
a0db5ade3e
Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9
2019-04-06 09:28:58 +10:00
e1955a2c54
Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9
2019-04-06 09:28:13 +10:00
8a158b82ba
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-05 16:45:36 +03:00
071a000d67
Merge branch 'tor-github/pr/906' into maint-0.4.0
2019-04-05 16:44:59 +03:00
0ba45b2977
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-05 14:57:06 +03:00
2cc3c98bc4
Merge branch 'tor-github/pr/901' into maint-0.4.0
2019-04-05 14:56:52 +03:00
Nick Mathewson
George Kadianakis
Alexander Færøy
teor
rl1987