teor
fc4d08e260
Merge branch 'bug26627_033' into bug26627_033_merged_master
2018-07-25 09:17:17 +10:00
teor
3821081a55
Stop putting unsupported ed25519 link auth in v3 onion service descs
...
Stop putting ed25519 link specifiers in v3 onion service descriptors,
when the intro point doesn't support ed25519 link authentication.
Fixes bug 26627; bugfix on 0.3.2.4-alpha.
2018-07-25 09:16:15 +10:00
teor
a99920c7d4
Stop sending unsupported ed25519 link specifiers in v3 introduce cells
...
Stop sending ed25519 link specifiers in v3 onion service introduce
cells, when the rendezvous point doesn't support ed25519 link
authentication.
Fixes bug 26627; bugfix on 0.3.2.4-alpha.
2018-07-25 09:16:04 +10:00
Nick Mathewson
dbf57ecf39
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-20 10:42:29 -04:00
Nick Mathewson
583df33e20
Merge branch 'maint-0.3.4'
2018-07-20 10:42:29 -04:00
Nick Mathewson
977821e59f
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-20 10:42:29 -04:00
Nick Mathewson
be3a962ca7
Merge branch 'ticket26647_032' into maint-0.3.2
2018-07-20 10:42:23 -04:00
Nick Mathewson
b44fce6716
Merge branch 'maint-0.3.4'
2018-07-19 08:32:00 -04:00
Nick Mathewson
0a60a94a55
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-19 08:31:07 -04:00
Nick Mathewson
27f5bd52fe
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-19 08:31:07 -04:00
Nick Mathewson
209332e71a
Merge remote-tracking branch 'teor/bug26853_032' into maint-0.3.2
2018-07-19 08:30:59 -04:00
Nick Mathewson
e0f99404f5
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-18 16:39:25 -04:00
Nick Mathewson
d5dd500e36
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-18 16:39:25 -04:00
Nick Mathewson
312a42fc85
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-18 16:39:25 -04:00
Nick Mathewson
64af15d373
Merge branch 'maint-0.3.4'
2018-07-18 16:39:25 -04:00
Nick Mathewson
93da2cae49
Changes file for bug 26787
2018-07-18 16:39:22 -04:00
Nick Mathewson
61e080e24a
Merge branch 'maint-0.3.4'
2018-07-18 15:09:28 -04:00
Nick Mathewson
a7bd20ebaf
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-18 15:08:57 -04:00
Nick Mathewson
c31700d664
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-18 15:04:14 -04:00
Nick Mathewson
559f79fd79
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-18 15:03:27 -04:00
Nick Mathewson
a321d72401
Merge branch 'bug26485_029_squashed' into maint-0.2.9
2018-07-18 15:01:03 -04:00
Nick Mathewson
dcee4d4c9c
Warn the directory authority operator if their versions list is bogus
...
Prevents bug 26485; bugfix on 0.1.1.6-alpha.
2018-07-18 15:00:53 -04:00
teor
449d190e2e
SKIP test_key_expiration.sh on Windows until the underlying issue is resolved
...
Skip an unreliable key expiration test on Windows, until the underlying
issue in bug 26076 is resolved.
Fixes bug 26853; bugfix on 0.3.2.1-alpha.
2018-07-18 12:37:12 +10:00
Nick Mathewson
e2b744ce38
Merge branch 'bug25552_ope_squashed'
2018-07-17 16:19:32 -04:00
George Kadianakis
f00b7a7faa
Add changes file.
2018-07-17 15:57:46 -04:00
Nick Mathewson
304ee896d1
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-17 14:56:52 -04:00
Nick Mathewson
28d1057d56
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-17 14:56:52 -04:00
Nick Mathewson
61a2762e35
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-17 14:56:52 -04:00
Nick Mathewson
12afdcc15a
Merge branch 'maint-0.3.4'
2018-07-17 14:56:52 -04:00
teor
6dafddd05d
SKIP test_keygen.sh on Windows until the underlying issue is resolved
...
Skip an unreliable key generation test on Windows, until the underlying
issue in bug 26076 is resolved.
Fixes bug 26830; bugfix on 0.2.7.3-rc.
2018-07-17 14:56:18 -04:00
Nick Mathewson
4833717d69
Merge branch 'maint-0.3.4'
2018-07-17 14:46:16 -04:00
Nick Mathewson
c7dcf252fd
Merge remote-tracking branch 'ahf-github/bugs/26437'
2018-07-17 14:33:31 -04:00
rl1987
8645647250
Fix build to work with --disable-unittests again
2018-07-17 12:09:34 +00:00
David Goulet
5aaea38d88
Merge remote-tracking branch 'pastly/issue26703'
2018-07-16 14:44:45 -04:00
Nick Mathewson
ef234ba303
Merge branch 'socks_trunnel4_squashed_merged'
2018-07-15 17:07:20 -04:00
Nick Mathewson
f608cc0f31
Merge remote-tracking branch 'tor-github/pr/179'
2018-07-13 18:30:17 -04:00
Taylor Yu
7585523cfc
Add changes file for ticket 26492
2018-07-13 12:34:23 -05:00
Alexander Færøy
46501cdd18
Fix forking tests on Windows when there is a space in the path.
...
See: https://bugs.torproject.org/26437
2018-07-13 12:46:18 +02:00
Nick Mathewson
710188f84e
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-12 14:32:16 -04:00
Nick Mathewson
98ee23ca1e
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-12 14:32:16 -04:00
Nick Mathewson
e0f33c1d3e
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-12 14:32:16 -04:00
Nick Mathewson
b6c50c6259
Merge branch 'maint-0.3.4'
2018-07-12 14:32:16 -04:00
Roger Dingledine
cd4795ca3e
put new bridge auth Serge into place
...
The "Bifroest" bridge authority has been retired; the new bridge authority
is "Serge", and it is operated by George from the TorBSD project.
Closes ticket 26771.
2018-07-12 14:12:13 -04:00
Nick Mathewson
7556933537
Merge branch 'socks_trunnel4_squashed' into socks_trunnel4_squashed_merged
2018-07-12 11:47:25 -04:00
rl1987
2f284d3325
Add changes file
2018-07-12 11:41:44 -04:00
Nick Mathewson
23cb9a046c
Tweak changes/bug26502
...
(When the ticket isn't a bugfix, we don't say "fixes bug XYZ". When
we do, then the version in "bugfix on XXX" is supposed to be the
first version that had the bug.)
2018-07-12 09:31:07 -04:00
Nick Mathewson
413b73450c
Merge remote-tracking branch 'imnotbad/bug26502'
2018-07-12 09:30:01 -04:00
Nick Mathewson
28db2c9291
Tweak changes file for 26663
2018-07-12 09:00:14 -04:00
Nick Mathewson
a7ec493d88
Merge remote-tracking branch 'imnotbad/bug26663'
2018-07-12 08:59:23 -04:00
Nick Mathewson
537092cdbb
Merge branch 'ticket26223'
2018-07-10 20:18:28 -04:00
