add tor 0.3.2

src/tor/.gitignore

@@ -0,0 +1,235 @@
+# Editor droppings
+\#*\#
+.#*
+*~
+*.swp
+*.swo
+# C stuff
+*.o
+*.obj
+# Diff droppings
+*.orig
+*.rej
+# gcov stuff
+*.gcno
+*.gcov
+*.gcda
+# Autotools stuff
+.deps
+.dirstamp
+*.trs
+*.log
+# Calltool stuff
+.*.graph
+# Stuff made by our makefiles
+*.bak
+# Python droppings
+*.pyc
+*.pyo
+# Cscope
+cscope.*
+# OSX junk
+*.dSYM
+.DS_Store
+# updateFallbackDirs.py temp files
+details-*.json
+uptime-*.json
+*.full_url
+*.last_modified
+
+# /
+/Makefile
+/Makefile.in
+/aclocal.m4
+/ar-lib
+/autom4te.cache
+/build-stamp
+/compile
+/configure
+/Doxyfile
+/orconfig.h
+/orconfig.h.in
+/config.cache
+/config.log
+/config.status
+/config.guess
+/config.sub
+/conftest*
+/micro-revision.*
+/patch-stamp
+/stamp-h
+/stamp-h.in
+/stamp-h1
+/TAGS
+/test-driver
+/tor.sh
+/tor.spec
+/depcomp
+/install-sh
+/missing
+/mkinstalldirs
+/Tor*Bundle.dmg
+/tor-*-win32.exe
+/coverage_html/
+/callgraph/
+
+# /contrib/
+/contrib/dist/tor.sh
+/contrib/dist/torctl
+/contrib/dist/tor.service
+/contrib/operator-tools/tor.logrotate
+/contrib/dist/suse/tor.sh
+
+# /debian/
+/debian/files
+/debian/micro-revision.i
+/debian/patched
+/debian/tor
+/debian/tor.postinst.debhelper
+/debian/tor.postrm.debhelper
+/debian/tor.prerm.debhelper
+/debian/tor.substvars
+
+# /doc/
+/doc/Makefile
+/doc/Makefile.in
+/doc/doxygen
+/doc/tor.1
+/doc/tor.1.in
+/doc/tor.html
+/doc/tor.html.in
+/doc/tor.1.xml
+/doc/tor-gencert.1
+/doc/tor-gencert.1.in
+/doc/tor-gencert.html
+/doc/tor-gencert.html.in
+/doc/tor-gencert.1.xml
+/doc/tor-resolve.1
+/doc/tor-resolve.1.in
+/doc/tor-resolve.html
+/doc/tor-resolve.html.in
+/doc/tor-resolve.1.xml
+/doc/torify.1
+/doc/torify.1.in
+/doc/torify.html
+/doc/torify.html.in
+/doc/torify.1.xml
+
+# /doc/spec/
+/doc/spec/Makefile
+/doc/spec/Makefile.in
+
+# /scripts
+/scripts/maint/checkOptionDocs.pl
+/scripts/maint/updateVersions.pl
+
+# /src/
+/src/Makefile
+/src/Makefile.in
+
+# /src/trace
+/src/trace/libor-trace.a
+
+# /src/common/
+/src/common/Makefile
+/src/common/Makefile.in
+/src/common/libor.a
+/src/common/libor-testing.a
+/src/common/libor.lib
+/src/common/libor-ctime.a
+/src/common/libor-ctime-testing.a
+/src/common/libor-ctime.lib
+/src/common/libor-crypto.a
+/src/common/libor-crypto-testing.a
+/src/common/libor-crypto.lib
+/src/common/libor-event.a
+/src/common/libor-event-testing.a
+/src/common/libor-event.lib
+/src/common/libcurve25519_donna.a
+/src/common/libcurve25519_donna.lib
+
+# /src/config/
+/src/config/Makefile
+/src/config/Makefile.in
+/src/config/sample-server-torrc
+/src/config/torrc
+/src/config/torrc.sample
+/src/config/torrc.minimal
+
+# /src/ext/
+/src/ext/ed25519/ref10/libed25519_ref10.a
+/src/ext/ed25519/ref10/libed25519_ref10.lib
+/src/ext/ed25519/donna/libed25519_donna.a
+/src/ext/ed25519/donna/libed25519_donna.lib
+/src/ext/keccak-tiny/libkeccak-tiny.a
+/src/ext/keccak-tiny/libkeccak-tiny.lib
+
+# /src/or/
+/src/or/Makefile
+/src/or/Makefile.in
+/src/or/tor
+/src/or/tor.exe
+/src/or/tor-cov
+/src/or/tor-cov.exe
+/src/or/libtor.a
+/src/or/libtor-testing.a
+/src/or/libtor.lib
+
+# /src/rust
+/src/rust/.cargo/config
+/src/rust/.cargo/registry
+/src/rust/target
+/src/rust/registry
+
+# /src/test
+/src/test/Makefile
+/src/test/Makefile.in
+/src/test/bench
+/src/test/bench.exe
+/src/test/test
+/src/test/test-slow
+/src/test/test-bt-cl
+/src/test/test-child
+/src/test/test-memwipe
+/src/test/test-ntor-cl
+/src/test/test-hs-ntor-cl
+/src/test/test-switch-id
+/src/test/test-timers
+/src/test/test_workqueue
+/src/test/test.exe
+/src/test/test-slow.exe
+/src/test/test-bt-cl.exe
+/src/test/test-child.exe
+/src/test/test-ntor-cl.exe
+/src/test/test-hs-ntor-cl.exe
+/src/test/test-memwipe.exe
+/src/test/test-switch-id.exe
+/src/test/test-timers.exe
+/src/test/test_workqueue.exe
+
+# /src/test/fuzz
+/src/test/fuzz/fuzz-*
+/src/test/fuzz/lf-fuzz-*
+
+# /src/tools/
+/src/tools/libtorrunner.a
+/src/tools/tor-checkkey
+/src/tools/tor-resolve
+/src/tools/tor-cov-resolve
+/src/tools/tor-gencert
+/src/tools/tor-cov-gencert
+/src/tools/tor-checkkey.exe
+/src/tools/tor-resolve.exe
+/src/tools/tor-cov-resolve.exe
+/src/tools/tor-gencert.exe
+/src/tools/tor-cov-gencert.exe
+/src/tools/Makefile
+/src/tools/Makefile.in
+
+# /src/trunnel/
+/src/trunnel/libor-trunnel-testing.a
+/src/trunnel/libor-trunnel.a
+
+# /src/win32/
+/src/win32/Makefile
+/src/win32/Makefile.in

src/tor/.gitlab-ci.yml

@@ -0,0 +1,45 @@
+before_script:
+    - apt-get update -qq
+    - apt-get upgrade -qy
+
+build:
+  script:
+    - apt-get install -qy --fix-missing automake build-essential
+      libevent-dev libssl-dev zlib1g-dev
+      libseccomp-dev liblzma-dev libscrypt-dev
+    - ./autogen.sh
+    - ./configure --disable-asciidoc --enable-fatal-warnings
+      --disable-silent-rules
+    - make check || (e=$?; cat test-suite.log; exit $e)
+    - make install
+
+update:
+  only:
+    - schedules
+  script: 
+    - "apt-get install -y --fix-missing git openssh-client"
+
+    # Run ssh-agent (inside the build environment)
+    - eval $(ssh-agent -s)
+
+    # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
+    - ssh-add <(echo "$DEPLOY_KEY")
+
+    # For Docker builds disable host key checking. Be aware that by adding that
+    # you are suspectible to man-in-the-middle attacks.
+    # WARNING: Use this only with the Docker executor, if you use it with shell
+    # you will overwrite your user's SSH config.
+    - mkdir -p ~/.ssh
+    - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+    # In order to properly check the server's host key, assuming you created the
+    # SSH_SERVER_HOSTKEYS variable previously, uncomment the following two lines
+    # instead.
+    - mkdir -p ~/.ssh
+    - '[[ -f /.dockerenv ]] && echo "$SSH_SERVER_HOSTKEYS" > ~/.ssh/known_hosts'
+    - echo "merging from torgit"
+    - git config --global user.email "labadmin@oniongit.eu"
+    - git config --global user.name "gitadmin"
+    - "mkdir tor"
+    - "cd tor" 
+    - git clone --bare https://git.torproject.org/tor.git
+    - git push --mirror git@oniongit.eu:network/tor.git

src/tor/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "src/ext/rust"]
+	path = src/ext/rust
+	url = https://git.torproject.org/user/sebastian/tor-rust-dependencies

src/tor/.travis.yml

@@ -0,0 +1,104 @@
+language: c
+
+compiler:
+  - gcc
+  - clang
+
+notifications:
+  irc:
+    channels:
+      - "irc.oftc.net#tor-ci"
+    template:
+      - "%{repository} %{branch} %{commit} - %{author}: %{commit_subject}"
+      - "Build #%{build_number} %{result}. Details: %{build_url}"
+    on_success: change
+    on_failure: change
+  email:
+    on_success: never
+    on_failure: change
+
+os:
+  - linux
+  ## Uncomment the following line to also run the entire build matrix on OSX.
+  ## This will make your CI builds take roughly ten times longer to finish.
+  # - osx
+
+## Use the Ubuntu Trusty images.
+dist: trusty
+
+## We don't need sudo. (The "apt:" stanza after this allows us to not need sudo;
+## otherwise, we would need it for getting dependencies.)
+sudo: false
+
+## (Linux only) Download our dependencies
+addons:
+  apt:
+    packages:
+      ## Required dependencies
+      - libevent-dev
+      - libseccomp2
+      - zlib1g-dev
+      ## Optional dependencies
+      - liblzma-dev
+      - libscrypt-dev
+      ## zstd doesn't exist in Ubuntu Trusty
+      #- libzstd
+
+## The build matrix in the following two stanzas expands into four builds (per OS):
+##
+##  * with GCC, with Rust
+##  * with GCC, without Rust
+##  * with Clang, with Rust
+##  * with Clang, without Rust
+env:
+  global:
+    ## The Travis CI environment allows us two cores, so let's use both.
+    - MAKEFLAGS="-j 2"
+  matrix:
+    - RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
+    - RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
+    - RUST_OPTIONS=""
+
+matrix:
+  ## If one build in the matrix fails (e.g. if building withour Rust and Clang
+  ## fails, but building with Rust and GCC is still going), then cancel the
+  ## entire job early and call the whole thing a failure.
+  fast_finish: true
+
+before_install:
+  ## If we're on OSX, homebrew usually needs to updated first
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
+  ## Download rustup
+  - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi
+
+install:
+  ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above)
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated openssl    || brew upgrade openssl;    }; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated libevent   || brew upgrade libevent;   }; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated pkg-config || brew upgrade pkg-config; }; fi
+  ## If we're on OSX also install the optional dependencies
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated xz         || brew upgrade xz;         }; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated libscrypt  || brew upgrade libscrypt;  }; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated zstd       || brew upgrade zstd;       }; fi
+  ## Install the nightly channels of rustc and cargo and setup our toolchain environment
+  - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain nightly; fi
+  - if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi
+  ## Get some info about rustc and cargo
+  - if [[ "$RUST_OPTIONS" != "" ]]; then which rustc; fi
+  - if [[ "$RUST_OPTIONS" != "" ]]; then which cargo; fi
+  - if [[ "$RUST_OPTIONS" != "" ]]; then rustc --version; fi
+  - if [[ "$RUST_OPTIONS" != "" ]]; then cargo --version; fi
+  ## If we're testing rust builds in offline-mode, then set up our vendored dependencies
+  - if [[ "$RUST_OPTIONS" == "--enable-rust" ]]; then git submodule init  ; fi
+  - if [[ "$RUST_OPTIONS" == "--enable-rust" ]]; then git submodule update; fi
+  - if [[ "$TOR_RUST_DEPENDENCIES" == "true" ]]; then export TOR_RUST_DEPENDENCIES=$PWD/src/ext/rust/crates; fi
+
+script:
+  - ./autogen.sh
+  - ./configure $RUST_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening
+  ## We run `make check` because that's what https://jenkins.torproject.org does.
+  - make check
+
+after_failure:
+  ## `make check` will leave a log file with more details of test failures.
+  - cat test-suite.log