00108b75d4
Merge branch 'tor-github/pr/924' into maint-0.4.0
2019-05-29 21:19:56 +03:00
c7f9f7e542
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-05-17 08:10:16 -04:00
e5deb2bbc7
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-05-17 08:10:16 -04:00
a521c42788
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-05-17 08:10:15 -04:00
4e262196a8
Update geoip and geoip6 to the May 13 2019 database.
2019-05-17 08:52:13 +02:00
cd264e145b
Merge branch 'tor-github/pr/1013' into maint-0.4.0
2019-05-15 13:45:39 +03:00
ff55840343
Don't pass a NULL into a %s when logging client auth file load failure
...
Fortunately, in 0.3.5.1-alpha we improved logging for various
failure cases involved with onion service client auth.
Unfortunately, for this one, we freed the file right before logging
its name.
Fortunately, tor_free() sets its pointer to NULL, so we didn't have
a use-after-free bug.
Unfortunately, passing NULL to %s is not defined.
Fortunately, GCC 9.1.1 caught the issue!
Unfortunately, nobody has actually tried building Tor with GCC 9.1.1
before. Or if they had, they didn't report the warning.
Fixes bug 30475; bugfix on 0.3.5.1-alpha.
2019-05-10 17:47:43 -04:00
e1d4e2badb
Merge branch 'tor-github/pr/978' into maint-0.4.0
2019-04-30 19:26:14 +03:00
593d29920e
Merge remote-tracking branch 'tor-github/pr/974' into maint-0.4.0
2019-04-29 10:15:03 -04: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
231036a110
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-04-19 12:00:41 +10:00
742b5b32d5
Merge remote-tracking branch 'tor-github/pr/710' into maint-0.3.5
2019-04-19 11:52:48 +10:00
cb084de5e5
Merge remote-tracking branch 'tor-github/pr/726' into maint-0.3.5
2019-04-19 11:51:05 +10:00
2ae67fee42
Merge remote-tracking branch 'tor-github/pr/745' into maint-0.3.5
2019-04-19 11:48:41 +10:00
4a66c2d636
Merge remote-tracking branch 'tor-github/pr/947' into maint-0.3.5
2019-04-19 11:47:50 +10:00
116970dda7
Merge remote-tracking branch 'tor-github/pr/946' into maint-0.3.4
2019-04-19 11:47:10 +10:00
b1762f8d12
Merge remote-tracking branch 'tor-github/pr/638' into maint-0.3.4
2019-04-19 11:44:38 +10:00
8154b33f9c
Merge remote-tracking branch 'tor-github/pr/791' into maint-0.3.4
2019-04-19 11:43:46 +10:00
2460b4461f
Merge remote-tracking branch 'tor-github/pr/792' into maint-0.2.9
2019-04-19 11:42:09 +10:00
ec213ae8a0
Merge remote-tracking branch 'tor-github/pr/772' into maint-0.2.9
2019-04-19 11:38:52 +10:00
6a179b1072
Merge branch 'tor-github/pr/891' into maint-0.4.0
2019-04-18 13:21:59 +03: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
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
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
12b9bfc05f
test: Also avoid reading the system default torrc in integration tests
...
Part of 29702.
2019-04-10 19:03:43 +10:00
acec0192c3
Add changes file
2019-04-10 18:45:36 +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
c7cf49dc3c
Merge branch 'tor-github/pr/915' into maint-0.4.0
2019-04-09 12:24:52 +03: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
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
George Kadianakis
Nick Mathewson
Karsten Loesing
Alexander Færøy
teor
rl1987