September 2017 - tor-commits - lists.torproject.org

[tor/master] Fix yml and improve ci flow
by nickm＠torproject.org 19 Sep '17

19 Sep '17

commit 1e654d1b9d0f6791fbd7969d7f4fc3c06ee264b7 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Sep 1 18:54:37 2017 +0200 Fix yml and improve ci flow --- .gitlab-ci.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 69e6656f4..d2634b4b8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,9 @@ -build: - script: +before_script: - "apt-get update -qq" - "apt-get upgrade -y" + +build: + script: - "apt-get install -y --fix-missing git openssh-client asciidoc wget gcc g++ automake cmake make libglib2.0 libglib2.0-dev libigraph0 libigraph0-dev libevent-dev openssl libssl-dev" - "sh autogen.sh && ./configure && make" - "make check" @@ -9,8 +11,6 @@ build: update: script: - - "apt-get update -qq" - - "apt-get upgrade -y" - "apt-get install -y --fix-missing git openssh-client" - # Run ssh-agent (inside the build environment) @@ -31,8 +31,9 @@ update: - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo "$SSH_SERVER_HOSTKEYS" > ~/.ssh/known_hosts' - echo "merging from torgit" - - git clone --bare https://git.torproject.org/tor.git - "cd tor" + - "mkdir tor" + - git clone --bare https://git.torproject.org/tor.git - git checkout master - git config --global user.email "labadmin(a)oniongit.eu" - git config --global user.name "gitadmin"

1 0

[tor/master] Update .gitlab-ci.yml
by nickm＠torproject.org 19 Sep '17

19 Sep '17

commit 40288fd7728989aea96cd9f68986ab68fdb1b05d Author: Hiro <me(a)hiro7.eu> Date: Wed Aug 16 19:20:04 2017 +0000 Update .gitlab-ci.yml --- .gitlab-ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 575fe7581..45e3052e4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,11 +23,9 @@ before_script: build: script: - - "sh autogen.sh && ./configure && make && make install" - -test: - script: - - "make test-full-online" + - "sh autogen.sh && ./configure && make" + - "make check" + - "make install" update: script:

1 0

[tor/master] Fix invalid yml
by nickm＠torproject.org 19 Sep '17

19 Sep '17

commit 1ec29a1bec6392339db92b86c450c66bfca74f14 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Sep 1 18:39:30 2017 +0200 Fix invalid yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13ea324f3..69e6656f4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,4 +36,4 @@ update: - git checkout master - git config --global user.email "labadmin(a)oniongit.eu" - git config --global user.name "gitadmin" - - git push --mirror git@oniongit.eu:hiro/tor.git + - git push --mirror git@oniongit.eu:hiro/tor.git \ No newline at end of file

1 0

[tor/master] Modify gitlab-ci for mirroring
by nickm＠torproject.org 19 Sep '17

19 Sep '17

commit ef03aa3f8ece80c8a7539c131efc4359eccf018c Author: hiromipaw <hiro(a)torproject.org> Date: Fri Sep 1 18:12:30 2017 +0200 Modify gitlab-ci for mirroring --- .gitlab-ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 45e3052e4..ef2847154 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,11 +30,9 @@ build: update: script: - echo "merging from torgit" - - git clone git@oniongit.eu:hiro/tor.git - - "cd tor" - - git remote add upstream https://git.torproject.org/tor.git + - git clone --bare https://git.torproject.org/tor.git + - "cd tor" - git checkout master - git config --global user.email "labadmin(a)oniongit.eu" - git config --global user.name "gitadmin" - - git pull -Xtheirs upstream master - - git push origin master + - git push --mirror git@oniongit.eu:hiro/tor.git

1 0

[tor/master] Modify gitlab-ci to merge into tor repo
by nickm＠torproject.org 19 Sep '17

19 Sep '17

commit 27473c5466940816b3cd75e9f3fb0fd11479c805 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Sep 1 19:33:25 2017 +0200 Modify gitlab-ci to merge into tor repo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2ab8800cd..78a1b0e7e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,4 +36,4 @@ update: - "mkdir tor" - "cd tor" - git clone --bare https://git.torproject.org/tor.git - - git push --mirror git@oniongit.eu:hiro/tor.git \ No newline at end of file + - git push --mirror git@oniongit.eu:network/tor.git \ No newline at end of file

1 0

[tor/master] Update .gitlab-ci.yml
by nickm＠torproject.org 19 Sep '17

19 Sep '17

commit 692fa16bad0dae4153fb4044d138c82c9ffa808b Author: Hiro <me(a)hiro7.eu> Date: Wed Aug 16 18:03:11 2017 +0000 Update .gitlab-ci.yml --- .gitlab-ci.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eda48c5f2..233782603 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,7 @@ before_script: - "apt-get update -qq" - "apt-get upgrade -y" - - "apt-get install -y --fix-missing git" - # Install ssh-agent if not already installed, it is required by Docker. - # (change apt-get to yum if you use a CentOS-based image) - - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' + - "apt-get install -y --fix-missing git openssh-client wget gcc g++ automake cmake make libglib2.0 libglib2.0-dev libigraph0 libigraph0-dev libevent-dev openssl libssl-dev python" # Run ssh-agent (inside the build environment) - eval $(ssh-agent -s)

1 0

[tor/master] Update .gitlab-ci.yml
by nickm＠torproject.org 19 Sep '17

19 Sep '17

commit b3a992d662d7cd9dcf11878e090d89d0123ccb3c Author: Hiro <me(a)hiro7.eu> Date: Wed Aug 16 18:16:09 2017 +0000 Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 94e39f14e..575fe7581 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ before_script: - "apt-get update -qq" - "apt-get upgrade -y" - - "apt-get install -y --fix-missing git openssh-client asciidoc-base wget gcc g++ automake cmake make libglib2.0 libglib2.0-dev libigraph0 libigraph0-dev libevent-dev openssl libssl-dev" + - "apt-get install -y --fix-missing git openssh-client asciidoc wget gcc g++ automake cmake make libglib2.0 libglib2.0-dev libigraph0 libigraph0-dev libevent-dev openssl libssl-dev" # Run ssh-agent (inside the build environment) - eval $(ssh-agent -s)

1 0

[tor/master] Update .gitlab-ci.yml
by nickm＠torproject.org 19 Sep '17

19 Sep '17

commit 72bf4be70dde4d29632873e30c15e9225d6a7c39 Author: Hiro <me(a)hiro7.eu> Date: Wed Aug 16 18:07:36 2017 +0000 Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 233782603..81023fd09 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ before_script: - "apt-get update -qq" - "apt-get upgrade -y" - - "apt-get install -y --fix-missing git openssh-client wget gcc g++ automake cmake make libglib2.0 libglib2.0-dev libigraph0 libigraph0-dev libevent-dev openssl libssl-dev python" + - "apt-get install -y --fix-missing git openssh-client wget gcc g++ automake cmake make libglib2.0 libglib2.0-dev libigraph0 libigraph0-dev libevent-dev openssl libssl-dev" # Run ssh-agent (inside the build environment) - eval $(ssh-agent -s)

1 0

[tor/master] Merge remote-tracking branch 'hiro/gitlab-ci'
by nickm＠torproject.org 19 Sep '17

19 Sep '17

commit 7581ac709444297f954782af38d19126264762ab Merge: a2caa466e 27473c546 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 19 13:43:53 2017 -0400 Merge remote-tracking branch 'hiro/gitlab-ci' .gitlab-ci.yml | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+)

1 0

[tor/master] note the format we expect for IPv6
by nickm＠torproject.org 19 Sep '17

19 Sep '17

commit 29e98d16d2efade887367c3c81fb0bbdeba943ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 19 13:19:45 2017 -0400 note the format we expect for IPv6 --- doc/tor.1.txt | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 4acdbb157..77c0e06c6 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -251,7 +251,9 @@ GENERAL OPTIONS [[ClientTransportPlugin]] **ClientTransportPlugin** __transport__ socks4|socks5 __IP__:__PORT__:: **ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]:: In its first form, when set along with a corresponding Bridge line, the Tor - client forwards its traffic to a SOCKS-speaking proxy on "IP:PORT". It's the + client forwards its traffic to a SOCKS-speaking proxy on "IP:PORT". + (IPv4 addresses should written as-is; IPv6 addresses should be wrapped in + square brackets.) It's the duty of that proxy to properly forward the traffic to the bridge. + + In its second form, when set along with a corresponding Bridge line, the Tor @@ -268,7 +270,8 @@ GENERAL OPTIONS [[ServerTransportListenAddr]] **ServerTransportListenAddr** __transport__ __IP__:__PORT__:: When this option is set, Tor will suggest __IP__:__PORT__ as the listening address of any pluggable transport proxy that tries to - launch __transport__. + launch __transport__. (IPv4 addresses should written as-is; IPv6 + addresses should be wrapped in square brackets.) [[ServerTransportOptions]] **ServerTransportOptions** __transport__ __k=v__ __k=v__ ...:: When this option is set, Tor will pass the __k=v__ parameters to @@ -412,7 +415,7 @@ GENERAL OPTIONS DataDirectory. If the option is set to 1, make the DataDirectory readable by the default GID. (Default: 0) -[[FallbackDir]] **FallbackDir** __ipv4address__:__port__ orport=__port__ id=__fingerprint__ [weight=__num__] [ipv6=__ipv6address__:__orport__]:: +[[FallbackDir]] **FallbackDir** __ipv4address__:__port__ orport=__port__ id=__fingerprint__ [weight=__num__] [ipv6=**[**__ipv6address__**]**:__orport__]:: When we're unable to connect to any directory cache for directory info (usually because we don't know about any yet) we try a directory authority. Clients also simultaneously try a FallbackDir, to avoid hangs on client @@ -442,7 +445,8 @@ GENERAL OPTIONS with probability proportional to that weight (default 1.0). If a flag "v3ident=**fp**" is given, the dirserver is a v3 directory authority whose v3 long-term signing key has the fingerprint **fp**. Lastly, - if an "ipv6=__ipv6address__:__orport__" flag is present, then the directory + if an "ipv6=**[**__ipv6address__**]**:__orport__" flag is present, then + the directory authority is listening for IPv6 connections on the indicated IPv6 address and OR Port. + + @@ -656,6 +660,7 @@ GENERAL OPTIONS is only useful when you have multiple network interfaces, and you want all of Tor's outgoing connections to use a single one. This option may be used twice, once with an IPv4 address and once with an IPv6 address. + IPv6 addresses should be wrapped in square brackets. This setting will be ignored for connections to the loopback addresses (127.0.0.0/8 and ::1). @@ -664,14 +669,17 @@ GENERAL OPTIONS originate from the IP address specified. This option overrides **OutboundBindAddress** for the same IP version. This option may be used twice, once with an IPv4 address and once with an IPv6 - address. This setting will be ignored for connections to the loopback + address. IPv6 addresses should be wrapped in square brackets. + This setting will be ignored for connections to the loopback addresses (127.0.0.0/8 and ::1). [[OutboundBindAddressExit]] **OutboundBindAddressExit** __IP__:: Make all outbound exit connections originate from the IP address specified. This option overrides **OutboundBindAddress** for the same IP version. This option may be used twice, once with an IPv4 - address and once with an IPv6 address. This setting will be ignored + address and once with an IPv6 address. + IPv6 addresses should be wrapped in square brackets. + This setting will be ignored for connections to the loopback addresses (127.0.0.0/8 and ::1). [[PidFile]] **PidFile** __FILE__::

1 0