 Nick Mathewson
|
a7e72f0c44
Merge branch 'maint-0.3.2' into maint-0.3.3
|
%!s(int64=7) %!d(string=hai) anos |
|
Nick Mathewson
|
57b207efa4
Merge branch 'maint-0.2.9' into maint-0.3.2
|
%!s(int64=7) %!d(string=hai) anos |
|
Nick Mathewson
|
ff1486385a
Merge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9
|
%!s(int64=7) %!d(string=hai) anos |
|
Nick Mathewson
|
67bdd144bd
Merge branch 'maint-0.3.2' into maint-0.3.3
|
%!s(int64=7) %!d(string=hai) anos |
|
Nick Mathewson
|
2b1b8bf2ca
Merge branch 'maint-0.2.9' into maint-0.3.2
|
%!s(int64=7) %!d(string=hai) anos |
 teor
|
35b0ac8d84
Travis: don't call echo with a --flag as the first argument
|
%!s(int64=7) %!d(string=hai) anos |
|
teor
|
4e4b6a2476
Travis: when showing a log fails, keep trying to show other logs
|
%!s(int64=7) %!d(string=hai) anos |
|
Nick Mathewson
|
a28c14aad5
Merge branch 'maint-0.3.2' into maint-0.3.3
|
%!s(int64=7) %!d(string=hai) anos |
|
Nick Mathewson
|
b40f9967fa
Merge branch 'maint-0.2.9' into maint-0.3.2
|
%!s(int64=7) %!d(string=hai) anos |
|
teor
|
541b89b061
Test: avoid spurious failures in make test-network-all
|
%!s(int64=7) %!d(string=hai) anos |
|
teor
|
3e298633ca
Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am
|
%!s(int64=7) %!d(string=hai) anos |
|
Nick Mathewson
|
64c3c6a790
Merge branch 'maint-0.3.2' into maint-0.3.3
|
%!s(int64=7) %!d(string=hai) anos |
|
teor
|
70a07fa90b
When running make test-network-all, use the mixed+hs-v2 network
|
%!s(int64=7) %!d(string=hai) anos |
|
Nick Mathewson
|
33e4e30d0a
Merge branch 'maint-0.3.2' into maint-0.3.3
|
%!s(int64=7) %!d(string=hai) anos |
|
Nick Mathewson
|
98e1a1d106
Merge branch 'ticket27286_032_v2' into maint-0.3.2
|
%!s(int64=7) %!d(string=hai) anos |
|
Nick Mathewson
|
14be9cba4e
Update the protocol versions recommendations to remove LinkAuth=1
|
%!s(int64=7) %!d(string=hai) anos |
|
Nick Mathewson
|
e01ea64f0a
Merge branch 'maint-0.3.2' into maint-0.3.3
|
%!s(int64=7) %!d(string=hai) anos |
|
Nick Mathewson
|
36bb11a650
Merge branch 'maint-0.2.9' into maint-0.3.2
|
%!s(int64=7) %!d(string=hai) anos |
|
teor
|
cc4ea34a26
Silence a compilation warning on MSVC 2017 and clang-cl
|
%!s(int64=7) %!d(string=hai) anos |
|
Nick Mathewson
|
c1ad40627b
Merge branch 'maint-0.2.9' into maint-0.3.2
|
%!s(int64=7) %!d(string=hai) anos |
|
Nick Mathewson
|
8691046ac6
Merge branch 'maint-0.3.2' into maint-0.3.3
|
%!s(int64=7) %!d(string=hai) anos |
|
Nick Mathewson
|
9068e2fa28
Mark cert_matches_key as not-intrusive; fix stretch compilation.
|
%!s(int64=7) %!d(string=hai) anos |
|
Nick Mathewson
|
3cfceeb45d
Merge branch 'maint-0.3.2' into maint-0.3.3
|
%!s(int64=7) %!d(string=hai) anos |
|
Nick Mathewson
|
f0633bc491
Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3
|
%!s(int64=7) %!d(string=hai) anos |
|
Nick Mathewson
|
a5bbe3f1d0
Merge branch 'maint-0.2.9' into maint-0.3.2
|
%!s(int64=7) %!d(string=hai) anos |
|
Nick Mathewson
|
a29e9a901d
Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2
|
%!s(int64=7) %!d(string=hai) anos |
|
Nick Mathewson
|
05d62a3b73
Merge remote-tracking branch 'teor/travis-osx-029' into maint-0.2.9
|
%!s(int64=7) %!d(string=hai) anos |
|
Nick Mathewson
|
245025a3df
Merge branch 'maint-0.3.2' into maint-0.3.3
|
%!s(int64=7) %!d(string=hai) anos |
|
Nick Mathewson
|
d52f406001
Merge branch 'maint-0.2.9' into maint-0.3.2
|
%!s(int64=7) %!d(string=hai) anos |
|
Nick Mathewson
|
4c0c4d4ade
Add changes file for 26873. I missed this when merging earlier.
|
%!s(int64=7) %!d(string=hai) anos |
