Nick Mathewson
0cbe0f9cab
Merge remote-tracking branch 'tor-github/pr/964'
2019-04-24 17:05:20 -04:00
David Goulet
f39dd0a700
Merge branch 'tor-github/pr/951'
2019-04-24 09:53:15 -04:00
David Goulet
5bcf87c224
Merge branch 'tor-github/pr/955'
2019-04-24 09:45:32 -04:00
David Goulet
4b599aaae4
Merge branch 'tor-github/pr/939'
2019-04-24 09:43:28 -04:00
teor
f35bd36814
test-network-all: Test IPv6-only v3 single onion services
...
In "make test-network-all", test IPv6-only v3 single onion services,
using the chutney network single-onion-v23-ipv6-md. This test will
not pass until 23588 has been merged.
Closes ticket 27251.
2019-04-24 17:42:59 +10:00
teor
b19dd1bb11
Update 23588 changes file to say what the patch actually does
...
Stop ignoring IPv6 link specifiers sent to v3 onion services.
v3 onion service IPv6 support is still incomplete, see 23493 for
details.
Fixes bug 23588; bugfix on 0.3.2.1-alpha.
Patch by Neel Chauhan.
2019-04-24 17:28:44 +10:00
Neel Chauhan
2618347657
Use fascist_firewall_choose_address_ls() in hs_get_extend_info_from_lspecs()
2019-04-24 17:28:34 +10:00
Nick Mathewson
15d4238383
Merge remote-tracking branch 'tor-github/pr/944'
2019-04-23 15:39:23 -04:00
Nick Mathewson
475ac11bc1
Merge remote-tracking branch 'tor-github/pr/935'
2019-04-23 14:11:04 -04:00
Nick Mathewson
6559aefc7b
Merge remote-tracking branch 'tor-github/pr/971'
2019-04-23 12:52:54 -04:00
Nick Mathewson
b0459de217
Merge branch 'ticket30051_take2_squashed'
2019-04-23 12:51:44 -04:00
rl1987
0c78811cea
Add changes file
2019-04-23 12:51:29 -04:00
Nick Mathewson
a7599c5be2
Merge remote-tracking branch 'tor-github/pr/962'
2019-04-23 12:48:37 -04:00
teor
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
teor
ac5753d3ca
Coding Standards: Document how to find git commits
...
Document how to find git commits and tags for bug fixes in
CodingStandards.md.
And update some changes file documentation.
Closes ticket 30261.
2019-04-23 10:03:18 +10:00
teor
9a97b5ff56
Travis: Show stem's tor log after failure
...
Closes ticket 30234.
2019-04-22 11:48:07 +10:00
teor
231036a110
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-04-19 12:00:41 +10:00
teor
742b5b32d5
Merge remote-tracking branch 'tor-github/pr/710' into maint-0.3.5
2019-04-19 11:52:48 +10:00
teor
cb084de5e5
Merge remote-tracking branch 'tor-github/pr/726' into maint-0.3.5
2019-04-19 11:51:05 +10:00
teor
2ae67fee42
Merge remote-tracking branch 'tor-github/pr/745' into maint-0.3.5
2019-04-19 11:48:41 +10:00
teor
4a66c2d636
Merge remote-tracking branch 'tor-github/pr/947' into maint-0.3.5
2019-04-19 11:47:50 +10:00
teor
116970dda7
Merge remote-tracking branch 'tor-github/pr/946' into maint-0.3.4
2019-04-19 11:47:10 +10:00
teor
b1762f8d12
Merge remote-tracking branch 'tor-github/pr/638' into maint-0.3.4
2019-04-19 11:44:38 +10:00
teor
8154b33f9c
Merge remote-tracking branch 'tor-github/pr/791' into maint-0.3.4
2019-04-19 11:43:46 +10:00
George Kadianakis
78223ab0fc
Merge branch 'tor-github/pr/938'
2019-04-18 13:23:32 +03:00
George Kadianakis
2db9bb02c7
Merge branch 'tor-github/pr/925'
2019-04-18 13:22:54 +03:00
George Kadianakis
d867b7ae1d
Merge branch 'maint-0.4.0'
2019-04-18 13:22:23 +03:00
George Kadianakis
6a179b1072
Merge branch 'tor-github/pr/891' into maint-0.4.0
2019-04-18 13:21:59 +03:00
rl1987
0d88b808e9
Remove contrib/dist/tor.sh.in
2019-04-17 13:15:02 +03:00
teor
728d20ed08
connection_edge: Return a web page when HTTPTunnelPort is misconfigured
...
Return an informative web page when the HTTPTunnelPort is used as an
HTTP proxy.
Closes ticket 27821, patch by "eighthave".
2019-04-17 17:58:40 +10:00
teor
c72f0cd5c7
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-04-17 16:46:40 +10:00
teor
37d7daa3cd
changes: update the changes file for 30001
2019-04-17 12:34:33 +10:00
Bernhard M. Wiedemann
8c4e68438d
Do not warn about compatible OpenSSL upgrades
...
When releasing OpenSSL patch-level maintenance updates,
we do not want to rebuild binaries using it.
And since they guarantee ABI stability, we do not have to.
Without this patch, warning messages were produced
that confused users:
https://bugzilla.opensuse.org/show_bug.cgi?id=1129411
Fixes bug 30190; bugfix on 0.2.4.2-alpha commit 7607ad2bec
2019-04-17 01:55:04 +02:00
Nick Mathewson
82b690d7da
Merge remote-tracking branch 'tor-github/pr/910'
2019-04-16 08:09:20 -04:00
Tobias Stoeckmann
670d0f9f5b
Clear memory in smartlist_remove_keeporder.
...
The smartlist functions take great care to reset unused pointers inside
the smartlist memory to NULL.
The function smartlist_remove_keeporder does not clear memory in such
way when elements have been removed. Therefore call memset after the
for-loop that removes elements. If no element is removed, it is
effectively a no-op.
Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
2019-04-15 14:51:36 -04:00
Nick Mathewson
358df18064
Merge branch 'bug30189_035' into bug30189_041
2019-04-15 14:27:32 -04:00
Nick Mathewson
802ac8ad61
Use a tor_abort_() wrapper in our util_bug.h macros
...
Previously, our use of abort() would break anywhere that we didn't
include stdlib.h. This was especially troublesome in case where
tor_assert_nonfatal() was used with ALL_BUGS_ARE_FATAL, since that
one seldom gets tested.
As an alternative, we could have just made this header include
stdlib.h. But that seems bloaty.
Fixes bug 30189; bugfix on 0.3.4.1-alpha.
2019-04-15 14:16:23 -04:00
George Kadianakis
9ae267538c
Merge branch 'tor-github/pr/941'
2019-04-15 13:57:40 +03:00
George Kadianakis
3f9efc5e88
Merge branch 'maint-0.4.0'
2019-04-15 13:56:48 +03:00
George Kadianakis
15591e1bbd
Merge branch 'tor-github/pr/948' into maint-0.4.0
2019-04-15 13:56:37 +03:00
rl1987
55b4f02ba6
Fix shellcheck warnings in fixup_filenames.sh
2019-04-15 12:13:35 +03:00
teor
1177818c32
Merge branch 'rust-panic1-035' into rust-panic1-040
2019-04-15 10:18:59 +10:00
teor
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
teor
5ab5c8ec15
Merge branch 'rust-panic1' into rust-panic1-034
2019-04-15 10:15:02 +10:00
Neel Chauhan
e728811110
Add changes file for Bug #29613
2019-04-14 12:48:07 -04:00
rl1987
db52180abe
Add changes file
2019-04-12 22:43:49 +03:00
teor
8ff6ab0a39
changes: file for 30117
2019-04-12 08:38:30 -04:00
George Kadianakis
7b386f2356
Merge branch 'tor-github/pr/908'
2019-04-12 13:47:08 +03:00
George Kadianakis
86aa141572
Merge branch 'tor-github/pr/754'
2019-04-12 13:45:53 +03:00
Neel Chauhan
c07d854772
Remove callback for setting bridges as running
2019-04-11 21:28:35 -04:00
Neel Chauhan
e16f5184da
Fix grammar in bug24490 changes file
2019-04-11 20:32:38 -04:00
Nick Mathewson
cdafcc49bc
Fix a memory leak in tor-resolve.c
...
Closes bug 30151/coverity CID 1441830. Bugfix on 0.4.0.1-alpha when
we started doing trunnel parsing in tor-resolve.c.
2019-04-11 19:10:05 -04:00
Nick Mathewson
7332346002
Changes file and practracker updates for 30149.
2019-04-11 18:58:44 -04:00
Nick Mathewson
85ff6f9114
Fix a memory leak on failure to create keys directory.
...
Fixes bug 30148, which is also CID 1437429 and CID 1437454. Bugfix
on 0.3.3.1-alpha, when separate key directories became a thing.
2019-04-11 18:18:14 -04:00
Nick Mathewson
e39b53ef7d
changes file and practracker updates for 30147.
2019-04-11 17:59:21 -04:00
Neel Chauhan
011307dd5f
Make repeated/rate limited HSFETCH queries fail with QUERY_RATE_LIMITED
2019-04-11 15:21:17 -04:00
Nick Mathewson
9fabf104ed
Merge remote-tracking branch 'tor-github/pr/913'
2019-04-11 14:30:05 -04:00
Nick Mathewson
d549440124
Merge remote-tracking branch 'tor-github/pr/887'
2019-04-11 14:29:16 -04:00
Nick Mathewson
3be1e26b8d
Merge branch 'maint-0.4.0'
2019-04-10 11:31:44 -04:00
Nick Mathewson
412bcc5b2a
Merge remote-tracking branch 'tor-github/pr/926' into maint-0.4.0
2019-04-10 11:31:33 -04:00
George Kadianakis
2cdc6b2005
Add changes file for #30040 .
2019-04-10 12:46:27 +03:00
teor
5722c6d12d
scripts: In git-pull-all.sh, also fetch the latest tor-github pull requests
...
Implements ticket 30114.
2019-04-10 19:26:47 +10:00
teor
a1d9f44971
Merge branch 'maint-0.4.0'
2019-04-10 18:27:11 +10:00
teor
454bdb22ee
Merge remote-tracking branch 'tor-github/pr/920' into maint-0.4.0
2019-04-10 18:26:49 +10:00
teor
8cfab3b7c3
doc: Improve the documentation for MapAddress .exit
...
Fixes bug 30109; bugfix on 0.1.0.1-rc.
2019-04-10 17:43:59 +10:00
Nick Mathewson
c24928dd8f
Changes file for bug30041
2019-04-09 12:05:33 -04:00
George Kadianakis
16041d7918
Merge branch 'maint-0.4.0'
2019-04-09 12:25:18 +03:00
George Kadianakis
c7cf49dc3c
Merge branch 'tor-github/pr/915' into maint-0.4.0
2019-04-09 12:24:52 +03:00
teor
3d45079c27
Merge branch 'maint-0.4.0'
2019-04-09 11:36:59 +10:00
teor
2dab7a1078
Merge remote-tracking branch 'tor-github/pr/862'
2019-04-09 11:36:12 +10:00
teor
92e8bdf296
Merge remote-tracking branch 'tor-github/pr/892' into maint-0.4.0
2019-04-09 11:35:41 +10:00
rl1987
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
Nick Mathewson
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
rl1987
0e0a0b9802
Fix SC2006 in minimize.sh
2019-04-08 11:16:45 +03:00
teor
4cffc7fe9c
Merge branch 'maint-0.4.0'
2019-04-06 12:23:25 +10:00
teor
b100c9e980
Merge remote-tracking branch 'tor-github/pr/911' into maint-0.4.0
2019-04-06 12:15:41 +10:00
teor
4dd96f7444
changes: Ticket 29241 is actually a bug on NSS in 0.3.5.1-alpha
2019-04-06 11:07:20 +10:00
Nick Mathewson
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
Nick Mathewson
680fd3f8fb
NSS: Log an error message when SSL_ExportKeyingMaterial() fails
...
Diagnostic for 29241.
2019-04-06 11:06:22 +10:00
teor
48e990359b
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-04-06 09:33:11 +10:00
teor
316aed502e
Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5
2019-04-06 09:32:53 +10:00
teor
ea5e371822
Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5
2019-04-06 09:31:52 +10:00
teor
44ea341117
Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5
2019-04-06 09:30:52 +10:00
teor
102178e6d4
Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4
2019-04-06 09:30:04 +10:00
teor
a0db5ade3e
Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9
2019-04-06 09:28:58 +10:00
teor
e1955a2c54
Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9
2019-04-06 09:28:13 +10:00
rl1987
e8e6931638
Add changes file
2019-04-05 19:03:41 +03:00
George Kadianakis
df4e2c42a8
Merge branch 'tor-github/pr/907'
2019-04-05 16:45:55 +03:00
George Kadianakis
071a000d67
Merge branch 'tor-github/pr/906' into maint-0.4.0
2019-04-05 16:44:59 +03:00
George Kadianakis
5584b6392d
Merge branch 'maint-0.4.0'
2019-04-05 14:57:06 +03:00
George Kadianakis
2cc3c98bc4
Merge branch 'tor-github/pr/901' into maint-0.4.0
2019-04-05 14:56:52 +03:00
George Kadianakis
76f1763976
Merge branch 'maint-0.4.0'
2019-04-05 14:55:22 +03:00
George Kadianakis
7fe169a500
Merge branch 'tor-github/pr/879' into maint-0.4.0
2019-04-05 14:55:09 +03:00
George Kadianakis
3393c8d510
Merge branch 'maint-0.4.0'
2019-04-05 14:53:39 +03:00
George Kadianakis
217db9efe1
Merge branch 'tor-github/pr/902' into maint-0.4.0
2019-04-05 14:53:33 +03:00
George Kadianakis
574c207670
Merge branch 'maint-0.4.0'
2019-04-05 14:51:33 +03:00
George Kadianakis
747b74c182
Merge branch 'tor-github/pr/800' into maint-0.4.0
2019-04-05 14:51:21 +03:00
teor
ac269d5c30
changes: file for 29660
2019-04-05 15:17:19 +10:00
teor
e992c5e4bc
Merge branch 'bug29500_040_monoinit_revert' into bug29500_master_monoinit
...
Apply data structure changes between 0.4.0 and 0.4.1.
2019-04-05 12:24:20 +10:00
Mike Perry
28db7646ba
Changes file for bug 29500.
2019-04-05 12:14:18 +10:00
