Merge branch 'maint-0.3.2' into maint-0.3.3

diff --cc .travis.yml
index 27534e4cfea54f274f2b649b5c24d7f0a993469b,bf55b7756a4f3dc031037f53a004d280d2c81bbe..3d61f5a61a6c70e59f763ea1ece00c3eae7a954d
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -96,10 -95,10 +96,12 @@@ matrix
    ## entry under that key outside the "include" clause.
    include:
      - compiler: gcc
 +    - compiler: gcc
 +      env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
      - compiler: gcc
        env: RUST_OPTIONS=""
+     - compiler: gcc
+       env: COVERAGE_OPTIONS="--enable-coverage"
      ## The "sudo: required" forces non-containerized builds, working
      ## around a Travis CI environment issue: clang LeakAnalyzer fails
      ## because it requires ptrace and the containerized environment no