diff options
| -rw-r--r-- | changes/bug26830 | 3 | ||||
| -rw-r--r-- | changes/task26771 | 4 | ||||
| -rw-r--r-- | src/or/auth_dirs.inc | 4 | ||||
| -rwxr-xr-x | src/test/test_keygen.sh | 8 |
4 files changed, 17 insertions, 2 deletions
diff --git a/changes/bug26830 b/changes/bug26830 new file mode 100644 index 0000000000..c002f19530 --- /dev/null +++ b/changes/bug26830 @@ -0,0 +1,3 @@ + o Minor bugfixes (continuous integration): + - 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. diff --git a/changes/task26771 b/changes/task26771 new file mode 100644 index 0000000000..fd700900f7 --- /dev/null +++ b/changes/task26771 @@ -0,0 +1,4 @@ + o Directory authority changes: + - 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. diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc index e0937541ea..08a919b053 100644 --- a/src/or/auth_dirs.inc +++ b/src/or/auth_dirs.inc @@ -8,8 +8,8 @@ "dizum orport=443 " "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", -"Bifroest orport=443 bridge " - "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1", +"Serge orport=9001 bridge " + "66.111.2.131:9030 BA44 A889 E64B 93FA A2B1 14E0 2C2A 279A 8555 C533", "gabelmoo orport=443 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "ipv6=[2001:638:a000:4140::ffff:189]:443 " diff --git a/src/test/test_keygen.sh b/src/test/test_keygen.sh index 87012cd283..4106425cb3 100755 --- a/src/test/test_keygen.sh +++ b/src/test/test_keygen.sh @@ -13,6 +13,14 @@ if [ $# -eq 0 ] || [ ! -f ${1} ] || [ ! -x ${1} ]; then fi fi +UNAME_OS=`uname -s | cut -d_ -f1` +if test "$UNAME_OS" = 'CYGWIN' || \ + test "$UNAME_OS" = 'MSYS' || \ + test "$UNAME_OS" = 'MINGW'; then + echo "This test is unreliable on Windows. See trac #26076. Skipping." >&2 + exit 77 +fi + if [ $# -ge 1 ]; then TOR_BINARY="${1}" shift |