[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 2968c716d7689eafcf32a1f5327af7b1ad1582ce
Merge: a3ec89a4f 1953a7e61
Author: Nick Mathewson 
Date:   Fri Jun 29 23:11:47 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 scripts/maint/checkSpace.pl | 5 -
 1 file changed, 5 deletions(-)

diff --cc scripts/maint/checkSpace.pl
index 6d19d6ccd,5af95a27e..3043eb1aa
--- a/scripts/maint/checkSpace.pl
+++ b/scripts/maint/checkSpace.pl
@@@ -168,32 -157,25 +168,27 @@@ for my $fn (@ARGV) 
  }
  }
  
 -  ## Check for forbidden functions except when they are
 -  # explicitly permitted
 -  if (/\bassert\(/ && not /assert OK/) {
 -  print "assert :$fn:$.   (use tor_assert)\n";
 -  }
 -  if (/\bmemcmp\(/ && not /memcmp OK/) {
 -  print "memcmp :$fn:$.   (use {tor,fast}_mem{eq,neq,cmp}\n";
 -  }
 -  # always forbidden.
 -  if (not / OVERRIDE /) {
 -  if (/\bstrcat\(/ or /\bstrcpy\(/ or /\bsprintf\(/) {
 -  print "$& :$fn:$.\n";
 -  }
 -  if (/\bmalloc\(/ or /\bfree\(/ or /\brealloc\(/ or
 -  /\bstrdup\(/ or /\bstrndup\(/ or /\bcalloc\(/) {
 -  print "$& :$fn:$.(use tor_malloc, tor_free, etc)\n";
 -  }
 -  }
 +## Check for forbidden functions except when they are
 +# explicitly permitted
 +if (/\bassert\(/ && not /assert OK/) {
 +msg "assert :$fn:$.   (use tor_assert)\n";
 +}
 +if (/\bmemcmp\(/ && not /memcmp OK/) {
 +msg "memcmp :$fn:$.   (use {tor,fast}_mem{eq,neq,cmp}\n";
 +}
 +# always forbidden.
 +if (not /\ OVERRIDE\ /) {
 +if (/\bstrcat\(/ or /\bstrcpy\(/ or /\bsprintf\(/) {
 +msg "$& :$fn:$.\n";
 +}
 +if (/\bmalloc\(/ or /\bfree\(/ or /\brealloc\(/ or
 +/\bstrdup\(/ or /\bstrndup\(/ or /\bcalloc\(/) {
 +msg "$& :$fn:$.(use tor_malloc, tor_free, etc)\n";
 +}
 +}
  }
  }
- ## Warn if the file doesn't end with a blank line.
- #(End each file with a single blank line.)
- if (! $lastnil) {
- msg "  EOL\@EOF:$fn:$.\n";
- }
  close(F);
  }
 +
 +exit $found;

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit a3ec89a4f8a6222403697b7f7fce5d5138b79994
Merge: d583459d5 3c0a63c40
Author: Nick Mathewson 
Date:   Fri Jun 29 13:49:43 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 src/test/test_shared_random.c | 1 +
 1 file changed, 1 insertion(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 1385a5118d55edd3dd672eeb793b662853f30758
Merge: d6d3f8486 b426e83f0
Author: Nick Mathewson 
Date:   Fri Jun 29 13:00:56 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 src/or/routerlist.c   | 2 ++
 src/or/shared_random_state.c  | 1 +
 src/test/test_hs.c| 7 +--
 src/test/test_shared_random.c | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit ea14d3408df7c846722b54484cf5b8d61de5384f
Merge: b89a66e99 890bc15ab
Author: Nick Mathewson 
Date:   Fri Jun 29 13:06:15 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/ticket26467 | 3 +++
 1 file changed, 3 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit d6d3f8486dbac9837a793f431dcd58505e7274e4
Merge: 340fcc7e2 fcd26af7c
Author: Nick Mathewson 
Date:   Tue Jun 26 09:21:59 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/feature26372_029 | 4 
 configure.ac | 6 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 340fcc7e2e1c1c78bb03c997601bf57bde9bf8e6
Merge: 9713ecfc4 dd69e74e3
Author: Nick Mathewson 
Date:   Sun Jun 17 19:24:48 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 .editorconfig | 33 +
 1 file changed, 33 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 16381b579ecd2a050d117765d51ead4b3c3ebbb9
Merge: d84581a3e ef671147f
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 19f386852333a6de5fbf9bcb3a4415b3bb135b4d
Merge: 1ef8023e0 ae540569c
Author: Nick Mathewson 
Date:   Tue Jun 12 08:11:19 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/geoip-2018-06-07 |4 +
 src/config/geoip | 5848 +-
 src/config/geoip6|  810 ++-
 3 files changed, 4354 insertions(+), 2308 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 1ef8023e000d9136b7069515f9d7303810a8f3b2
Merge: f48fb8a72 719b5c1d2
Author: Nick Mathewson 
Date:   Fri Jun 8 10:11:57 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug26196  |  4 
 src/or/protover.c | 13 +
 2 files changed, 17 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit f48fb8a720c7cca79249248f92e3bc99cee3414d
Merge: d3a972561 c380562ae
Author: Nick Mathewson 
Date:   Thu May 24 09:40:06 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug26116   |  7 +++
 src/common/crypto.c|  7 ++-
 src/test/test_crypto.c | 41 +
 3 files changed, 54 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit d3a972561aeb38d7b346be1826054c60bf3adfaa
Merge: 502d2c006 d1e4ffc71
Author: Nick Mathewson 
Date:   Wed May 16 12:11:45 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug26072 | 5 +
 src/or/relay.c   | 1 +
 2 files changed, 6 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 502d2c00625501f312496d842aeb16a840d4d7b0
Merge: 2d61a8351 033e4723f
Author: Nick Mathewson 
Date:   Tue May 15 09:32:44 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/geoip-2018-05-01 |4 +
 src/config/geoip | 5455 ++
 src/config/geoip6|  971 +++--
 3 files changed, 4468 insertions(+), 1962 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit ba70439210c57b0e0e60b07f116f101725085d85
Merge: aa08c1970 edb6acf9c
Author: Nick Mathewson 
Date:   Thu May 10 09:19:28 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 src/test/test_dir.c | 20 
 1 file changed, 20 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit aa08c197034a7dcd061f3c205a29dc1cb09641d3
Merge: 6361a250f bca8a104b
Author: Nick Mathewson 
Date:   Thu May 10 08:00:35 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/ticket26062| 3 +++
 src/or/networkstatus.c | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 6361a250f08421aa1e6db1093aaa488ee24ce77d
Merge: 726f238b7 5227754b2
Author: Nick Mathewson <ni...@torproject.org>
Date:   Thu May 3 13:38:54 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.1

_______
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 993e314c6f08d587480070e9f19d313b81b39a09
Merge: bb35405d2 d465bd27e
Author: Nick Mathewson 
Date:   Wed May 2 08:46:28 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug26007 |  5 +
 src/or/dirserv.c | 13 +++--
 2 files changed, 16 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 5cc3a0379eba0eb4e9baac97468fcaebcc654437
Merge: e88863407 34e7dca9c
Author: Nick Mathewson 
Date:   Tue Apr 24 10:38:37 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 .travis.yml  | 5 -
 changes/travis_distcheck | 4 
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --cc .travis.yml
index bf55b7756,6da3027b8..3f133782d
--- a/.travis.yml
+++ b/.travis.yml
@@@ -96,9 -89,9 +96,11 @@@ matrix
include:
  - compiler: gcc
  - compiler: gcc
 +  env: RUST_OPTIONS=""
 +- compiler: gcc
env: COVERAGE_OPTIONS="--enable-coverage"
+ - compiler: gcc
+   env: DISTCHECK="yes"
  ## 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

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 5c3639923fb3d7a1bfc7b38248001e67333fa35e
Merge: ce8e7427b 9727b4c5d
Author: Nick Mathewson 
Date:   Mon Apr 23 09:23:31 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug24969 | 3 +++
 src/common/sandbox.c | 3 +++
 2 files changed, 6 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit ce8e7427b9284ef12b69d50d72c8fc315b90e36d
Merge: 5e0fbd700 d3ff12630
Author: Nick Mathewson 
Date:   Tue Apr 17 10:47:30 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 .travis.yml   | 9 -
 changes/coveralls | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --cc .travis.yml
index 0c0188410,dc0a8ac67..bf55b7756
--- a/.travis.yml
+++ b/.travis.yml
@@@ -96,7 -89,7 +96,9 @@@ matrix
include:
  - compiler: gcc
  - 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
@@@ -111,7 -101,8 +113,8 @@@ before_install
## If we're on OSX, homebrew usually needs to updated first
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
## Download rustup
 -  - curl -Ssf -o rustup.sh https://sh.rustup.rs
 +  - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh 
https://sh.rustup.rs; fi
+   - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user 
cpp-coveralls; fi
  
  install:
## If we're on OSX use brew to install required dependencies (for Linux, 
see the "apt:" section above)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 5e0fbd7006993a4e402f2eee49f6f86074923197
Merge: db6902c23 0e13ff481
Author: Nick Mathewson 
Date:   Mon Apr 16 13:48:23 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 src/common/address.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit db6902c23530f8d58e999701685e9cbd74b15a82
Merge: e813116d3 10a1969ca
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:29 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --cc src/or/include.am
index 5d5ff5c41,19cf00264..7548ed094
--- a/src/or/include.am
+++ b/src/or/include.am
@@@ -144,10 -127,9 +144,11 @@@ endi
  
  ORHEADERS = \
src/or/addressmap.h \
+   src/or/auth_dirs.inc\
 +  src/or/bridges.h\
src/or/buffers.h\
src/or/channel.h\
 +  src/or/channelpadding.h \
src/or/channeltls.h \
src/or/circpathbias.h   \
src/or/circuitbuild.h   \

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 834eef2452a667c5557e5a09bb879cc2fc98a661
Merge: 5acfc3087 b68e636b3
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 5acfc3087663340f55de6081cdd13b484525f43a
Merge: 068d09274 4bb7d9fd1
Author: Nick Mathewson 
Date:   Tue Mar 27 18:23:53 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug25629  |  3 +++
 src/or/nodelist.c | 13 ++---
 2 files changed, 9 insertions(+), 7 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 068d092749508bae84e6d5fce605d2f40c1bdb80
Merge: 1aa0ae2cc 9f93bcd16
Author: Nick Mathewson 
Date:   Mon Mar 26 10:29:29 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/feature25313 |  4 
 src/common/sandbox.c | 23 ++-
 2 files changed, 6 insertions(+), 21 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 1aa0ae2cc3547a35a44967ed56c1f78a42c076f8
Merge: 0e7f15fdb 3370b3cfe
Author: Nick Mathewson 
Date:   Mon Mar 19 05:42:43 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 .travis.yml | 24 
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --cc .travis.yml
index 19bbe6df0,6d314c141..d6450d270
--- a/.travis.yml
+++ b/.travis.yml
@@@ -60,19 -60,28 +60,35 @@@ env
global:
  ## The Travis CI environment allows us two cores, so let's use both.
  - MAKEFLAGS="-j 2"
 +  matrix:
 +## Leave at least one entry here or Travis seems to generate a
 +## matrix entry with empty matrix environment variables.  Leaving
 +## more than one entry causes unwanted matrix entries with
 +## unspecified compilers.
 +- RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
 +# - 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
+   ## Uncomment to allow the build to report success (with non-required
+   ## sub-builds continuing to run) if all required sub-builds have
+   ## succeeded.  This is somewhat buggy currently: it can cause
+   ## duplicate notifications and prematurely report success if a
+   ## single sub-build has succeeded.  See
+   ## https://github.com/travis-ci/travis-ci/issues/1696
+   # fast_finish: true
+ 
+   ## Uncomment the appropriate lines below to allow the build to
+   ## report success even if some less-critical sub-builds fail and it
+   ## seems likely to take a while for someone to fix it.  Currently
+   ## Travis CI doesn't distinguish "all builds succeeded" from "some
+   ## non-required sub-builds failed" except on the individual build's
+   ## page, which makes it somewhat annoying to detect from the
+   ## branches and build history pages.  See
+   ## https://github.com/travis-ci/travis-ci/issues/8716
+   allow_failures:
+ # - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
+ # - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode
+ # - compiler: clang
  
## Create explicit matrix entries to work around a Travis CI
## environment issue.  Missing keys inherit from the first list

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 0e7f15fdb6a5523ab1d4c856b5db455df3b3e1aa
Merge: 0aa794d30 67a313f0e
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:02 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 2e2aacca2aa635a840c57e87e3769403505a19d2
Merge: c527a8a9c 9eb6f9d3c
Author: Nick Mathewson 
Date:   Sat Mar 3 11:32:29 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.1

"ours" merge to avoid version bump.




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 805a785780c2f3abccf080caddc345ca8f484797
Merge: d4a758e08 35753c077
Author: Nick Mathewson 
Date:   Thu Mar 1 16:42:25 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.1

"ours" merge to avoid version bump.




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit d4a758e08373854639af6991ec95836fa7c15ca4
Merge: ac1942ac5 c1bb8836f
Author: Nick Mathewson 
Date:   Thu Mar 1 16:07:59 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug25249 |   3 +
 changes/bug25249.2   |   3 +
 changes/trove-2018-001.1 |   6 ++
 changes/trove-2018-004   |   8 +++
 src/or/protover.c|  35 --
 src/test/test_protover.c | 171 +++
 6 files changed, 220 insertions(+), 6 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 2bcd264a28e2d6bec1e806e779bf82435c9c7505
Merge: 3930ffdf6 cb92d47de
Author: Nick Mathewson 
Date:   Fri Feb 16 09:48:11 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug24952|   5 +
 changes/bug25223|   4 +
 changes/ticket24902 |  13 +
 changes/ticket25122 |   4 +
 changes/ticket25202 |   4 +
 doc/tor.1.txt   |  95 ++
 src/common/address.c|  27 +-
 src/common/address.h|   2 +
 src/common/address_set.c| 129 +++
 src/common/address_set.h|  35 ++
 src/common/include.am   |   2 +
 src/common/log.c|   2 +-
 src/common/torlog.h |   4 +-
 src/or/channel.c|   9 +-
 src/or/channel.h|   3 +-
 src/or/channeltls.c |   2 +-
 src/or/command.c|  13 +
 src/or/config.c |  25 ++
 src/or/connection.c |  16 +
 src/or/dos.c| 794 
 src/or/dos.h| 140 
 src/or/geoip.c  | 205 ++--
 src/or/geoip.h  |  29 ++
 src/or/include.am   |   2 +
 src/or/main.c   |   2 +
 src/or/networkstatus.c  |  13 +-
 src/or/nodelist.c   |  78 +
 src/or/nodelist.h   |   3 +
 src/or/or.h |  33 ++
 src/or/relay.c  |  14 +-
 src/or/rendmid.c|  12 +
 src/or/status.c |   2 +
 src/test/include.am |   2 +
 src/test/test.c |  20 ++
 src/test/test.h |   2 +
 src/test/test_address_set.c | 174 ++
 src/test/test_dos.c | 497 +++
 37 files changed, 2371 insertions(+), 45 deletions(-)

diff --cc doc/tor.1.txt
index c4c569836,a7ee7d11c..a6b4f2fc4
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@@ -2405,9 -2438,104 +2405,104 @@@ The following options are used to confi
  non-anonymous HiddenServiceSingleHopMode. Enables direct connections in 
the
  server-side hidden service protocol.  If you are using this option,
  you need to disable all client-side services on your Tor instance,
 -including setting SOCKSPort to "0".
 -(Default: 0)
 +including setting SOCKSPort to "0". Can not be changed while tor is
 +running. (Default: 0)
  
+ DENIAL OF SERVICE MITIGATION OPTIONS
+ 
+ 
+ The following options are useful only for a public relay. They control the
+ Denial of Service mitigation subsystem.
+ 
+ [[DoSCircuitCreationEnabled]] **DoSCircuitCreationEnabled** 
**0**|**1**|**auto**::
+ 
+ Enable circuit creation DoS mitigation. If enabled, tor will cache client
+ IPs along with statistics in order to detect circuit DoS attacks. If an
+ address is positively identified, tor will activate defenses against the
+ address. See the DoSCircuitCreationDefenseType option for more details.
+ This is a client to relay detection only. "auto" means use the consensus
+ parameter. If not defined in the consensus, the value is 0.
+ (Default: auto)
+ 
+ [[DoSCircuitCreationMinConnections]] **DoSCircuitCreationMinConnections** 
__NUM__::
+ 
+ Minimum threshold of concurrent connections before a client address can be
+ flagged as executing a circuit creation DoS. In other words, once a client
+ address reaches the circuit rate and has a minimum of NUM concurrent
+ connections, a detection is positive. "0" means use the consensus
+ parameter. If not defined in the consensus, the value is 3.
+ (Default: 0)
+ 
+ [[DoSCircuitCreationRate]] **DoSCircuitCreationRate** __NUM__::
+ 
+ The allowed circuit creation rate per second applied per client IP
+ address. If this option is 0, it obeys a consensus parameter. If not
+ defined in the consensus, the value is 3.
+ (Default: 0)
+ 
+ [[DoSCircuitCreationBurst]] **DoSCircuitCreationBurst** __NUM__::
+ 
+ The allowed circuit creation burst per client IP address. If the circuit
+ rate and the burst are reached, a client is marked as executing a circuit
+ creation DoS. "0" means use the consensus parameter. If not defined in the
+ consensus, the value is 90.
+ (Default: 0)
+ 
+ [[DoSCircuitCreationDefenseType]] **DoSCircuitCreationDefenseType** __NUM__::
+ 
+ This is the type of defense applied to a detected client address. The
+ possible values are:
+ 
+   1: No defense.
+   2: Refuse circuit creation for the DoSCircuitCreationDefenseTimePeriod 
period of time.
+ +
+ "0" means use the consensus parameter. If not defined in the consensus,
+ the value is 2.
+ (Default: 0)
+ 
+ [[DoSCircuitCreationDefenseTimePeriod]] 
**DoSCircuitCreationDefenseTimePeriod** __N__ 
**seconds**|**minutes**|**hours**::
+ 
+ The base time period in seconds that the DoS defense is activated for. The
+ actual value is selected randomly for each activation from N+1 to 3/2 * N.
+ "0" means use the 

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 3930ffdf63425c344e14c45cff6780108cfa038b
Merge: d21e5cfc2 2b99350ca
Author: Nick Mathewson 
Date:   Fri Feb 16 08:47:12 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.1

"ours" merge to avoid conflicts with the cherry-picked fix for 24898.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit f647035b3783eb14c79cea949b36efa97861fbc2
Merge: 17a923941 f0ed7895c
Author: Nick Mathewson 
Date:   Tue Feb 13 16:55:18 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug21074_downgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 17a923941a41d9283cad0cb093024c872fafdb0a
Merge: 91109bc81 e658dad62
Author: Nick Mathewson 
Date:   Tue Feb 13 08:50:58 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/ticket25170 |  5 +
 src/or/dirserv.c| 10 --
 2 files changed, 13 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 91109bc813211516e34f25fc4418211488a8ab57
Merge: b2c4d4e7f e91bae66d
Author: Nick Mathewson 
Date:   Mon Feb 12 08:33:47 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug23318| 11 +++
 changes/bug24170|  3 +++
 src/or/routerlist.c | 48 +++-
 3 files changed, 45 insertions(+), 17 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit b2c4d4e7fae3dda864282953c05ab3b9b0f1b22d
Merge: 8939eaf47 84c13336c
Author: Nick Mathewson 
Date:   Sun Feb 11 18:11:04 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug24198 |  4 
 src/common/sandbox.c | 16 +++-
 2 files changed, 19 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 8939eaf479bc123e774421c9de6dfc3c864e0326
Merge: eccef6ba6 848ba26c1
Author: Nick Mathewson 
Date:   Sun Feb 11 18:09:35 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/ticket24315  |  3 +++
 configure.ac |  2 ++
 src/common/sandbox.c | 71 +---
 3 files changed, 72 insertions(+), 4 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit eccef6ba60e59c6d7001d8f6623eb4d01ea8ca11
Merge: 86583ad78 5dc785cee
Author: Nick Mathewson 
Date:   Sun Feb 11 16:51:56 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug21074_downgrade |  4 
 src/common/compat.c| 14 +++---
 2 files changed, 11 insertions(+), 7 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 86583ad78e6c75ea0094553584428f795089c482
Merge: 04a8e81fa 320dac460
Author: Nick Mathewson 
Date:   Sat Feb 10 16:09:00 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug24978   |  7 +++
 src/common/ciphers.inc | 21 -
 src/common/tortls.c| 28 +---
 3 files changed, 52 insertions(+), 4 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 04a8e81fa9d323819a7294f80aca9477794386bc
Merge: 9cbc40e37 0ddc2dc53
Author: Nick Mathewson 
Date:   Thu Feb 8 10:29:05 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/geoip-2018-02-07 | 4 +
 src/config/geoip | 34364 -
 src/config/geoip6|   841 +-
 3 files changed, 28369 insertions(+), 6840 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits