Nick Mathewson
82d758afa8
Merge remote-tracking branch 'tor-github/pr/279'
2018-08-28 15:24:30 -04:00
Colin Childs
f0792537e9
Adding new fallback
2018-08-28 13:05:59 -05:00
Nick Mathewson
3b960df4f9
Merge branch 'bug26896_034'
2018-08-28 12:35:50 -04:00
rl1987
326b510bae
manpage: Warn users about comma-separating addr-port pairs
2018-08-28 18:49:34 +03:00
rl1987
3890ad2578
Stricter HiddenServicePort parsing
2018-08-28 18:32:31 +03:00
David Goulet
d9bfc9e2e3
fixup! hs: Learn service version by trying to load the keys
2018-08-28 08:36:28 -04:00
Nick Mathewson
64c3c6a790
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-27 09:39:08 -04:00
Nick Mathewson
0483f7f64c
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-27 09:39:08 -04:00
Nick Mathewson
103dd68ba8
Merge branch 'maint-0.3.4'
2018-08-27 09:39:08 -04:00
teor
70a07fa90b
When running make test-network-all, use the mixed+hs-v2 network
...
No behaviour change.
A previous fix to chutney removed v3 onion services from the
mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is
confusing.
Fixes bug 27345; bugfix on 0.3.2.1-alpha.
2018-08-27 23:07:20 +10:00
cypherpunks
0cd72a2833
core/mainloop: more comments documenting connection.c
2018-08-27 01:32:34 +00:00
cypherpunks
309961138b
core/mainloop: fix documentation of connection_handle_write_impl()
...
Inaccurate since d9746bd468f551d1ada57d962b20eddd15256ce9.
2018-08-27 01:07:01 +00:00
Nick Mathewson
2e54c80aec
Merge branch 'maint-0.3.4'
...
"ours" to avoid version bump.
2018-08-24 16:50:24 -04:00
Nick Mathewson
81175ecafd
Forward-port changelog from 0.3.4.7-rc
2018-08-24 16:50:12 -04:00
Nick Mathewson
4c1c818ffa
Update to 0.3.4.7-rc-dev
2018-08-24 16:49:56 -04:00
Nick Mathewson
bb65b53966
Fix a compilation warning on i386 with clang
2018-08-24 16:13:30 -04:00
Nick Mathewson
7217bdacb5
Merge remote-tracking branch 'tor-github/pr/289'
2018-08-24 12:57:18 -04:00
Nick Mathewson
4c3b43604b
Merge remote-tracking branch 'teor/ticket27211'
2018-08-24 12:45:42 -04:00
Nick Mathewson
622231ce2e
Merge remote-tracking branch 'teor/bug27237'
2018-08-24 12:44:46 -04:00
Nick Mathewson
b1d0fa04fb
Merge branch 'maint-0.3.4'
2018-08-24 12:35:26 -04:00
Nick Mathewson
658171318f
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-24 12:35:23 -04:00
Nick Mathewson
33e4e30d0a
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-24 12:32:10 -04:00
Nick Mathewson
98e1a1d106
Merge branch 'ticket27286_032_v2' into maint-0.3.2
2018-08-24 12:32:06 -04:00
Nick Mathewson
14be9cba4e
Update the protocol versions recommendations to remove LinkAuth=1
...
LinkAuth method 1 is the one where we pull the TLS master secrets
out of the OpenSSL data structures and authenticate them with
RSA. Right now we list method 1 as required for clients and relays.
That's a problem, since we can't reasonably support it with NSS. So
let's remove it as a requirement and a recommendation.
As for method 3: I'd like to recommend it it, but that would make
0.2.9 start warning. Let's not do that till at least some time
after 0.3.5 (the next LTS) is stable.
Closes ticket 27286
2018-08-24 12:31:01 -04:00
Nick Mathewson
08a1619e7f
Merge branch 'maint-0.3.4'
2018-08-24 12:05:39 -04:00
teor
dd27e17ccc
Bootstrap: add some extra logging
...
Diagnostics for 27236.
2018-08-24 12:05:36 -04:00
teor
3ebbc1c84d
Bootstrap: allow internal-only onion service networks to bootstrap
...
This fix requires chutney's 27230 fix to bridge client bootstrap.
Part of 27236.
2018-08-24 12:05:29 -04:00
Nick Mathewson
49fe7f24d6
Remove changes entries for stuff that is already in maint-0.3.4
2018-08-24 09:15:34 -04:00
Nick Mathewson
4c939f89ae
Merge branch 'maint-0.3.4'
...
"ours" merge to avoid version bump.
2018-08-24 09:13:37 -04:00
Nick Mathewson
4748fd23da
Bump to 0.3.4.7-rc
2018-08-24 09:13:20 -04:00
Nick Mathewson
f36b3faa75
Merge branch 'maint-0.3.4'
2018-08-24 08:32:33 -04:00
teor
7a5896d5d4
Bootstrap: try harder to get descriptors in non-exit test networks
...
Use the mid weight for the third hop when there are no exits.
Fixes bug 27237; bugfix on 0.2.6.2-alpha.
2018-08-24 12:49:05 +10:00
teor
4217dc0558
Add scripts/test/chutney-git-bisect.sh, for bisecting using chutney
...
Supports bisection on 0.3.4 and earlier.
Recommend that users copy the script before bisecting.
Implements ticket 27211.
2018-08-24 12:46:04 +10:00
teor
588c77677a
Bootstrap: stop requiring descriptors to count exits as usable
...
Instead, count exits as usable if they have the exit flag, and
present if they also have a non-reject exit policy.
Requiring a threshold of usable descriptors avoids directories trickling
exit descriptors to clients to discover their ExitNodes settings.
Part of 27236.
2018-08-24 12:08:11 +10:00
Nick Mathewson
677048fe9f
Merge branch 'maint-0.3.4'
2018-08-23 20:44:16 -04:00
Nick Mathewson
d0007db1f0
Merge remote-tracking branch 'teor/bug26979-034' into maint-0.3.4
2018-08-23 20:44:06 -04:00
teor
78049afaa5
Appveyor CI: always use HEAD for the short commit
...
Part of 26979.
2018-08-24 10:11:24 +10:00
teor
8425091718
Appveyor CI: Changes file for 26979
...
Closes 26979.
2018-08-24 10:11:20 +10:00
teor
3ecb7125b4
Appveyor CI: sort environmental variables
...
To avoid future duplicates.
2018-08-24 10:11:17 +10:00
teor
32fb4403e3
Appveyor CI: fix some typos
2018-08-24 10:11:13 +10:00
teor
965a910abf
Appveyor CI: Generate correct tag names
...
Part of 26979.
2018-08-24 10:11:10 +10:00
teor
4157015700
Appveyor CI: Switch to one URL per line
...
Part of 26979.
2018-08-24 10:11:07 +10:00
teor
6a870c69bb
Appveyor CI: Generate correct branches and URLs for pull requests
...
Part of 26979.
2018-08-24 10:11:03 +10:00
teor
d8ce84aae4
Appveyor CI: Make short commits 10 hexdigits long
...
That's what git does for tor.
Part of 26979.
2018-08-24 10:11:00 +10:00
teor
73d46b76fd
Appveyor CI: Fix GitHub provider detection
...
Part of 26979.
2018-08-24 10:10:55 +10:00
Nick Mathewson
9323f5d1d4
Merge branch 'maint-0.3.4'
2018-08-23 20:07:47 -04:00
Nick Mathewson
90f6c590af
Merge remote-tracking branch 'teor/ticket27275-034' into maint-0.3.4
2018-08-23 20:07:39 -04:00
teor
08ad1f1e46
CI: Only post Appveyor IRC notifications when the build fails
...
Implements 27275.
2018-08-24 10:06:06 +10:00
Nick Mathewson
d50f90bfc4
Merge branch 'maint-0.3.4'
2018-08-23 19:37:32 -04:00
Nick Mathewson
e01ea64f0a
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-23 19:36:45 -04:00