diff options
| -rw-r--r-- | changes/asciidoc-UTC | 4 | ||||
| -rwxr-xr-x | doc/asciidoc-helper.sh | 2 | ||||
| -rw-r--r-- | src/or/config.c | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/changes/asciidoc-UTC b/changes/asciidoc-UTC new file mode 100644 index 0000000000..21fbfc1d67 --- /dev/null +++ b/changes/asciidoc-UTC @@ -0,0 +1,4 @@ + o Minor bugfixes (build): + - When building manual pages, set the timezone to "UTC", so that the + output is reproducible. Fixes bug 19558; bugfix on 0.2.2.9-alpha. + Patch from intrigeri. diff --git a/doc/asciidoc-helper.sh b/doc/asciidoc-helper.sh index c06b57026b..a3ef53f884 100755 --- a/doc/asciidoc-helper.sh +++ b/doc/asciidoc-helper.sh @@ -19,7 +19,7 @@ if [ "$1" = "html" ]; then base=${output%%.html.in} if [ "$2" != none ]; then - "$2" -d manpage -o $output $input; + TZ=UTC "$2" -d manpage -o $output $input; else echo "=================================="; echo; diff --git a/src/or/config.c b/src/or/config.c index 0850013d33..908f098ce7 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -919,11 +919,6 @@ static const char *default_authorities[] = { "dannenberg orport=443 " "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 " - "v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " - "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417" - /* XX/teor - urras may have an IPv6 address, but it's not in urras' - * descriptor as of 11 Dec 2015. See #17813. */, "maatuska orport=80 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "ipv6=[2001:67c:289c::9]:80 " |