[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2020-02-10 Thread nickm 
commit 71c49f735636d626abaa13222aa14e7c97f73393
Merge: 7afb95d3e f3fa22bf1
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:10 2020 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 2 files changed, 5 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/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2020-01-29 Thread teor 
commit 6b392c333a854bb4d18ae6ea1686627451bb03f8
Merge: 9b0b2aef8 65825018c
Author: teor 
Date:   Thu Jan 30 07:55:05 2020 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/bug29819  |  8 
 src/lib/sandbox/sandbox.c | 40 ++--
 2 files changed, 10 insertions(+), 38 deletions(-)




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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2020-01-15 Thread teor 
commit fb541ffca31d4906642ffb3bbe6bb6079cfcb1c9
Merge: f5461a4bd 026f068bb
Author: teor 
Date:   Thu Jan 16 10:00:40 2020 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/ticket32407  |  4 
 src/core/mainloop/mainloop.c |  4 
 src/lib/evloop/compat_libevent.c | 10 ++
 src/lib/evloop/compat_libevent.h |  3 +++
 4 files changed, 21 insertions(+)




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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-12-19 Thread teor 
commit 72376378714fef727004830157da79be97821a60
Merge: ffccf6fc5 d96b35d66
Author: teor 
Date:   Fri Dec 20 10:12:43 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1

 .travis.yml | 10 --
 changes/ticket32240 |  4 
 changes/ticket32242 |  2 ++
 3 files changed, 10 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/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-12-15 Thread teor 
commit ffccf6fc55f691e01ccd3e756486415cbc7ffe8a
Merge: 7174a80ed 748117298
Author: teor 
Date:   Mon Dec 16 08:16:12 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1

 .travis.yml | 9 +
 changes/ticket32177 | 3 ---
 changes/ticket32629 | 4 
 3 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/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-12-09 Thread nickm 
commit 7aaf714e8eae3419b2885c937276c3f7ab28bdbc
Merge: 6513102b9 b9504f788
Author: Nick Mathewson 
Date:   Mon Dec 9 16:02:07 2019 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1




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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-12-06 Thread nickm 
commit 6513102b9d186793402e05ec3d37f077d01a0cc2
Merge: 8933c7908 c7ca3fc18
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:08 2019 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)



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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-12-05 Thread nickm 
commit db1065403ddabacd7c67273bff30f027151fb142
Merge: cfa9cc34a e66533bef
Author: Nick Mathewson 
Date:   Thu Dec 5 13:31:17 2019 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1

"ours" 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/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-12-04 Thread teor 
commit cfa9cc34aa36c0f300724a01998633efbe8439ea
Merge: 14089a29b 92fb09906
Author: teor 
Date:   Thu Dec 5 10:14:01 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/bug31571|  7 +++
 changes/bug31810|  4 
 src/lib/err/backtrace.c | 42 ++---
 src/lib/err/backtrace.h |  1 +
 src/lib/err/torerr.c| 11 +--
 src/lib/process/process_unix.c  |  9 +
 src/lib/process/process_win32.c | 18 ++
 src/test/test_process_slow.c| 30 +
 8 files changed, 101 insertions(+), 21 deletions(-)

diff --cc src/lib/err/backtrace.c
index 2408a6851,8606f4217..8bc7e6965
--- a/src/lib/err/backtrace.c
+++ b/src/lib/err/backtrace.c
@@@ -198,13 -193,12 +198,10 @@@ static int trap_signals[] = { SIGSEGV, 
  /** Install signal handlers as needed so that when we crash, we produce a
   * useful stack trace. Return 0 on success, -errno on failure. */
  static int
- install_bt_handler(const char *software)
+ install_bt_handler(void)
  {
 -  int trap_signals[] = { SIGSEGV, SIGILL, SIGFPE, SIGBUS, SIGSYS,
 - SIGIO, -1 };
int i, rv=0;
  
-   strncpy(bt_version, software, sizeof(bt_version) - 1);
-   bt_version[sizeof(bt_version) - 1] = 0;
- 
struct sigaction sa;
  
memset(, 0, sizeof(sa));
@@@ -260,10 -237,11 +257,11 @@@ remove_bt_handler(void
  
  #ifdef NO_BACKTRACE_IMPL
  void
 -log_backtrace_impl(int severity, int domain, const char *msg,
 +log_backtrace_impl(int severity, log_domain_mask_t domain, const char *msg,
 tor_log_fn logger)
  {
-   logger(severity, domain, "%s. (Stack trace not available)", msg);
+   logger(severity, domain, "%s: %s. (Stack trace not available)",
+  bt_version, msg);
  }
  
  static int
diff --cc src/lib/err/torerr.c
index 21b28a5f6,1a246e995..b7e32a3e2
--- a/src/lib/err/torerr.c
+++ b/src/lib/err/torerr.c
@@@ -206,20 -163,14 +207,26 @@@ tor_raw_assertion_failed_msg_(const cha
}
  
dump_stack_symbols_to_error_fds();
+ 
+   /* Some platforms (macOS, maybe others?) can swallow the last write before 
an
+* abort. This issue is probably caused by a race condition between write
+* buffer cache flushing, and process termination. So we write an extra
+* newline, to make sure that the message always gets through. */
+   tor_log_err_sigsafe_write("\n");
  }
  
 +/**
 + * Call the abort() function to kill the current process with a fatal
 + * error. But first, close the raw error file descriptors, so error messages
 + * are written before process termination.
 + **/
 +void
 +tor_raw_abort_(void)
 +{
 +  tor_log_close_sigsafe_err_fds();
 +  abort();
 +}
 +
  /* As format_{hex,dex}_number_sigsafe, but takes a radix argument
   * in range 2..16 inclusive. */
  static int



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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-12-02 Thread teor 
commit 14089a29b54f1bc46ca0ff263abdc152f013051a
Merge: 26071aa3b febbc236d
Author: teor 
Date:   Tue Dec 3 12:46:50 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1

 .travis.yml | 14 +-
 changes/ticket32500 |  5 +
 2 files changed, 14 insertions(+), 5 deletions(-)




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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-11-24 Thread teor 
commit 26071aa3be8f26d7e81384f1d40bb1d5fe94cca0
Merge: 29eb7b07e 055f5d4d1
Author: teor 
Date:   Mon Nov 25 12:37:07 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/bug30344|  4 
 changes/bug31939|  3 +++
 changes/bug32108|  8 
 changes/ticket28970 |  6 ++
 changes/ticket31091 |  3 +++
 changes/ticket31548 |  7 +++
 changes/ticket32058 |  5 +
 src/core/mainloop/connection.c  | 18 --
 src/core/mainloop/mainloop.c| 12 +++-
 src/core/mainloop/periodic.c|  5 +
 src/feature/client/transports.c |  6 ++
 src/feature/hs/hs_client.c  |  8 ++--
 src/feature/hs/hs_service.c |  9 +
 src/lib/tls/buffers_tls.c   |  4 ++--
 14 files changed, 83 insertions(+), 15 deletions(-)




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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-11-11 Thread nickm 
commit 29eb7b07ef5d5af0c54bbc36804363a0bfdd3252
Merge: 7043be968 329aa1c48
Author: Nick Mathewson 
Date:   Mon Nov 11 10:14:04 2019 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/geoip-2019-11-06 | 4 +
 src/config/geoip | 15751 +++--
 src/config/geoip6|  3078 ++---
 3 files changed, 11485 insertions(+), 7348 deletions(-)



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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-11-10 Thread teor 
commit 7043be968a6ebe6fe56f139fc8db372aa9a7379a
Merge: de6ceb0be 29940511e
Author: teor 
Date:   Mon Nov 11 14:19:47 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1

 .appveyor.yml| 2 +-
 changes/bug32449 | 5 +
 2 files changed, 6 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/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-11-05 Thread teor 
commit de6ceb0bee8c1bf56d8929940a109bdc2a2d7521
Merge: 4f9a00339 03e77ef03
Author: teor 
Date:   Wed Nov 6 11:19:46 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/bug31408|  5 
 changes/bug31837|  5 
 src/lib/fs/conffile.c   | 10 +---
 src/test/test_config.c  | 68 +
 src/test/test_rebind.py | 16 +++-
 5 files changed, 93 insertions(+), 11 deletions(-)




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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-10-28 Thread teor 
commit 63aff4a43e0ed2b50632beb4e630f2504881538e
Merge: 63581d55a 54e2d0dc2
Author: teor 
Date:   Tue Oct 29 08:26:48 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1

 .travis.yml | 7 ---
 changes/ticket32241 | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)




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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-10-24 Thread teor 
commit 63581d55a691e56cde121194558db8a139ab9e74
Merge: 8bc65cda4 e56e7e865
Author: teor 
Date:   Fri Oct 25 10:56:06 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1

 .travis.yml| 12 ++--
 changes/ticket31919_bionic |  5 +
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --cc .travis.yml
index 7347ae5df,0eeaecdae..a3b17fed7
--- a/.travis.yml
+++ b/.travis.yml
@@@ -45,8 -45,16 +45,16 @@@ matrix
compiler: clang
  ## We run chutney on Linux, because it's faster than chutney on macOS
  - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
+   ## (Linux only) Use an older Linux image (Ubuntu Trusty)
+   ## The Xenial and Bionic images cause permissions issues for chutney,
+   ## this is a workaround, until we fix #32240.
+   dist: trusty
+ ## We check asciidoc with distcheck, to make sure we remove doc products
+ ## We use Linux clang, because there are no other Linux clang jobs
+ - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes"
+   compiler: clang
  ## We include a single coverage build with the best options for coverage
 -- env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS=""
 +- env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" 
TOR_TEST_RNG_SEED="636f766572616765"
  ## We run rust on Linux, because it's faster than rust on macOS
  ## We check rust offline
  - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true



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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-10-22 Thread teor 
commit 4a5c909ce5e91e916620de4b8dde28d42b4d4d8e
Merge: 3c071f300 57acdaa3f
Author: teor 
Date:   Wed Oct 23 08:47:15 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1

 .appveyor.yml| 6 +++---
 .travis.yml  | 6 --
 changes/ticket31372_appveyor | 4 
 changes/ticket31372_travis   | 4 
 4 files changed, 15 insertions(+), 5 deletions(-)




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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-10-22 Thread nickm 
commit 6965798a160e7caa07899216f35d9d6641ed
Merge: 4c8af10f0 4013e50cb
Author: Nick Mathewson 
Date:   Tue Oct 22 12:10:30 2019 -0400

Merge branch 'maint-0.4.0' into maint-0.4.1

 .appveyor.yml| 12 
 changes/bug31884 |  3 +++
 2 files changed, 15 insertions(+)



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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-10-22 Thread teor 
commit 2318bb237fa9ce908efdb0cf89dbeaffe3871939
Merge: 53aa15963 9bb0ca122
Author: teor 
Date:   Tue Oct 22 20:48:13 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1

 .travis.yml | 12 +++-
 changes/ticket32177 |  3 +++
 2 files changed, 10 insertions(+), 5 deletions(-)




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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-10-21 Thread nickm 
commit 53aa159632ea5138614e974a2709c378dfe53cde
Merge: 400e31ad1 89ead08ee
Author: Nick Mathewson 
Date:   Mon Oct 21 18:44:44 2019 -0400

Merge branch 'maint-0.4.0' into maint-0.4.1

 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 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/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-10-16 Thread teor 
commit 400e31ad1937aeaa962349eef058945080c46daa
Merge: 13daf339a e483257e1
Author: teor 
Date:   Thu Oct 17 14:52:06 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1




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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-10-02 Thread nickm 
commit 4dcbbe4166192beae321001e820bd3c15a8f2512
Merge: 6f3f93d86 a74c18069
Author: Nick Mathewson 
Date:   Wed Oct 2 08:01:34 2019 -0400

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/geoip-2019-10-01 | 4 +
 src/config/geoip | 35299 ++---
 src/config/geoip6|  8318 ---
 3 files changed, 26359 insertions(+), 17262 deletions(-)



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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-09-17 Thread nickm 
commit 5f00c03ed0327917409b074b99b7509c26128617
Merge: c3e94a8cc 9e674d0eb
Author: Nick Mathewson 
Date:   Tue Sep 17 21:28:38 2019 -0400

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/bug31657| 5 +
 src/feature/client/entrynodes.c | 3 ++-
 src/test/test_entrynodes.c  | 3 ++-
 3 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/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-09-17 Thread nickm 
commit c3e94a8ccdea60d460d0095821c1743c0f815367
Merge: a3342b382 a1f97bb25
Author: Nick Mathewson 
Date:   Tue Sep 17 21:26:32 2019 -0400

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/doc31089|   4 +
 contrib/operator-tools/tor-exit-notice.html | 177 +++-
 2 files changed, 176 insertions(+), 5 deletions(-)



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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-09-17 Thread nickm 
commit 50f981719f1bc7066496bcc4ef78fcdbb1ff1806
Merge: cec42be57 ef3543558
Author: Nick Mathewson 
Date:   Tue Sep 17 18:58:44 2019 -0400

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/ticket31673   | 3 +++
 src/lib/meminfo/meminfo.c | 7 ---
 2 files changed, 7 insertions(+), 3 deletions(-)



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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-09-17 Thread nickm 
commit cec42be570fcbbfbc5971e0ceba21e8eadd32d21
Merge: ab74c3560 34bab120d
Author: Nick Mathewson 
Date:   Tue Sep 17 18:56:52 2019 -0400

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/ticket31687_1 |  4 
 changes/ticket31687_2 |  5 +
 src/core/or/connection_edge.c |  7 +--
 src/lib/math/fp.c | 17 -
 4 files changed, 22 insertions(+), 11 deletions(-)




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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-09-04 Thread teor 
commit 4596ead2fc88e4b1482b0f3bc8ff356daea2337b
Merge: 9dd908e71 896a1ac50
Author: teor 
Date:   Thu Sep 5 14:48:02 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1




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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-09-04 Thread teor 
commit 9dd908e7138ecc4c26c7db2f1c1be4776499237d
Merge: c08d3e46c 1203e137b
Author: teor 
Date:   Thu Sep 5 12:05:12 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1




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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-08-30 Thread teor 
commit 25e7fc5b7a84c926f3acebd385e97d2679097bd6
Merge: ff905f8e1 a52a5e009
Author: teor 
Date:   Fri Aug 30 23:33:10 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1




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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-08-27 Thread asn 
commit 5a73f369dbd4d19ced536f4862b12ef98d6a2002
Merge: 7c92f4faa 357e9a6f2
Author: George Kadianakis 
Date:   Tue Aug 27 11:49:36 2019 +0300

Merge branch 'maint-0.4.0' into maint-0.4.1




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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-08-19 Thread nickm 
commit bba64c9882ffabfdd5cc75554bef222e7eb1e25a
Merge: 6eb5a811d 90f4ed233
Author: Nick Mathewson 
Date:   Mon Aug 19 10:37:21 2019 -0400

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/ticket31406  | 3 +++
 src/app/config/auth_dirs.inc | 2 +-
 2 files changed, 4 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/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-08-11 Thread teor 
commit 6eb5a811d732f59d5cd203c966d09ac820421642
Merge: fc89397fa 20943d00f
Author: teor 
Date:   Mon Aug 12 13:10:14 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1




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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-08-09 Thread teor 
commit fc89397fa9db3230c41004ba315ad1724540e46b
Merge: fb19d13f2 bad001080
Author: teor 
Date:   Sat Aug 10 07:26:30 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1




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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-08-08 Thread teor 
commit 40d7f1e3a67cf44e50e009c313baf686e6b2
Merge: 6d0883e9e 0a661cde1
Author: teor 
Date:   Thu Aug 8 11:19:58 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1

 .travis.yml | 8 +---
 changes/ticket30591 | 3 +++
 changes/ticket30694 | 3 +++
 3 files changed, 11 insertions(+), 3 deletions(-)




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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-08-08 Thread teor 
commit 6d0883e9e932a9557a2c2ed0c358a6bf91b99c4e
Merge: 21531f35f e27a74b1b
Author: teor 
Date:   Thu Aug 8 11:11:35 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1




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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-07-01 Thread nickm 
commit 5e1660100027e742c39c073c84add64e093f7745
Merge: 3ccf91027 2a42d6be2
Author: Nick Mathewson 
Date:   Mon Jul 1 14:25:12 2019 -0400

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/ticket28795  |   5 +
 src/app/config/fallback_dirs.inc | 567 ++-
 2 files changed, 266 insertions(+), 306 deletions(-)



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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-06-11 Thread nickm 
commit ce89fe36c8d5e6210a2418430c91c3df03d86bdc
Merge: 29842f68e afa2c39ba
Author: Nick Mathewson 
Date:   Tue Jun 11 10:17:18 2019 -0400

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/geoip-2019-06-10 | 4 +
 src/config/geoip | 14985 +
 src/config/geoip6|  2391 ++--
 3 files changed, 9920 insertions(+), 7460 deletions(-)



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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-06-10 Thread teor 
commit 2779ce1f6fbcb9a80284246593758e5fce71d718
Merge: 5b07ff401 4ca18fde9
Author: teor 
Date:   Tue Jun 11 14:52:36 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1




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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-06-10 Thread nickm 
commit 5b07ff40112390518d95caa90447cd5faf938cf7
Merge: 6a72cc259 c8447f95e
Author: Nick Mathewson 
Date:   Mon Jun 10 18:44:31 2019 -0400

Merge branch 'maint-0.4.0' into maint-0.4.1

 .travis.yml  | 4 
 changes/bug30744 | 3 +++
 2 files changed, 7 insertions(+)




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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-06-10 Thread nickm 
commit 6a72cc25983850fb23bd21adb181b38c0ead2c5a
Merge: c0285320d 430dd2da6
Author: Nick Mathewson 
Date:   Mon Jun 10 18:33:26 2019 -0400

Merge branch 'maint-0.4.0' into maint-0.4.1

 .travis.yml | 2 ++
 changes/bug30713| 5 +
 src/test/test_rebind.py | 7 +++
 src/test/test_rebind.sh | 4 ++--
 4 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/master] Merge branch 'maint-0.4.0'

2019-06-05 Thread nickm 
commit 3c2b2f072f996ba958ed5b6e07d3bac02291fc4a
Merge: 30f0e993c 6a6f7eb67
Author: Nick Mathewson 
Date:   Wed Jun 5 16:24:10 2019 -0400

Merge branch 'maint-0.4.0'

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-05-29 Thread asn 
commit 650bdca97f2bf45b27fe8ae0f9a2da5cbf36f959
Merge: 24a2352d5 00108b75d
Author: George Kadianakis 
Date:   Wed May 29 21:20:02 2019 +0300

Merge branch 'maint-0.4.0'

 changes/ticket29702 |  4 
 src/test/test_key_expiration.sh |  3 ++-
 src/test/test_keygen.sh |  3 ++-
 src/test/test_rebind.py | 10 +-
 src/test/zero_length_keys.sh|  3 ++-
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --cc src/test/test_key_expiration.sh
index 1ed81c81c,347421060..54abb4a2f
--- a/src/test/test_key_expiration.sh
+++ b/src/test/test_key_expiration.sh
@@@ -60,12 -60,13 +60,13 @@@ if [ ! -d "$DATA_DIR" ]; the
echo "Failure: mktemp invocation result doesn't point to directory" >&2
exit 3
  fi
 -trap "rm -rf '$DATA_DIR'" 0
 +trap 'rm -rf "$DATA_DIR"' 0
  
  # Use an absolute path for this or Tor will complain
 -DATA_DIR=`cd "${DATA_DIR}" && pwd`
 +DATA_DIR=$(cd "${DATA_DIR}" && pwd)
  
  touch "${DATA_DIR}/empty_torrc"
+ touch "${DATA_DIR}/empty_defaults_torrc"
  
  QUIETLY="--hush"
  SILENTLY="--quiet"
diff --cc src/test/test_keygen.sh
index 9fbf7dd57,7afff271c..cbdfd1909
--- a/src/test/test_keygen.sh
+++ b/src/test/test_keygen.sh
@@@ -77,12 -77,13 +77,13 @@@ if [ ! -d "$DATA_DIR" ]; the
echo "Failure: mktemp invocation result doesn't point to directory" >&2
exit 3
  fi
 -trap "rm -rf '$DATA_DIR'" 0
 +trap 'rm -rf "$DATA_DIR"' 0
  
  # Use an absolute path for this or Tor will complain
 -DATA_DIR=`cd "${DATA_DIR}" && pwd`
 +DATA_DIR=$(cd "${DATA_DIR}" && pwd)
  
  touch "${DATA_DIR}/empty_torrc"
+ touch "${DATA_DIR}/empty_defaults_torrc"
  
  QUIETLY="--hush"
  SILENTLY="--quiet"
diff --cc src/test/zero_length_keys.sh
index 4069148e0,5635bdfd8..1702d1124
--- a/src/test/zero_length_keys.sh
+++ b/src/test/zero_length_keys.sh
@@@ -40,9 -40,10 +40,10 @@@ if [ ! -d "$DATA_DIR" ]; the
echo "Failure: mktemp invocation result doesn't point to directory" >&2
exit 3
  fi
 -trap "rm -rf '$DATA_DIR'" 0
 +trap 'rm -rf "$DATA_DIR"' 0
  
  touch "$DATA_DIR"/empty_torrc
+ touch "$DATA_DIR"/empty_defaults_torrc
  
  # DisableNetwork means that the ORPort won't actually be opened.
  # 'ExitRelay 0' suppresses a warning.

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-05-17 Thread nickm 
commit 9cec7a7b5c6a947642ae81942f68e96fa403fc9f
Merge: d86896b29 c7f9f7e54
Author: Nick Mathewson 
Date:   Fri May 17 08:10:17 2019 -0400

Merge branch 'maint-0.4.0'

 changes/geoip-2019-05-13 | 4 +
 src/config/geoip | 15407 ++---
 src/config/geoip6|  3771 +++
 3 files changed, 11335 insertions(+), 7847 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-05-15 Thread nickm 
commit f664c0c31885eac5d36298772d4ecf2e10a10021
Merge: 1de11dc47 7e3f7ab40
Author: Nick Mathewson 
Date:   Wed May 15 07:41:42 2019 -0400

Merge branch 'maint-0.4.0'

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-05-15 Thread asn 
commit 1de11dc47a81913cf32e7c40834869631c18ba3d
Merge: 43d411945 cd264e145
Author: George Kadianakis 
Date:   Wed May 15 13:46:20 2019 +0300

Merge branch 'maint-0.4.0'

 changes/bug30475| 4 
 src/feature/hs/hs_service.c | 4 ++--
 2 files changed, 6 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/master] Merge branch 'maint-0.4.0'

2019-05-02 Thread nickm 
commit 1f13c2bd231886a84ef2359e4e060179ce788f9a
Merge: 2fca2ed49 2b54733dc
Author: Nick Mathewson 
Date:   Thu May 2 14:33:09 2019 -0400

Merge branch 'maint-0.4.0'

"ours" 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/master] Merge branch 'maint-0.4.0'

2019-04-30 Thread nickm 
commit 39bd10dca65fb4007a3da2a15323e6a8bebfd0aa
Merge: 847fc3280 cafb99981
Author: Nick Mathewson 
Date:   Tue Apr 30 15:54:03 2019 -0400

Merge branch 'maint-0.4.0'

"ours" 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/master] Merge branch 'maint-0.4.0'

2019-04-30 Thread asn 
commit 847fc3280d4a77859c28f4c6c91c2cdf863c5c43
Merge: f2800b53a e1d4e2bad
Author: George Kadianakis 
Date:   Tue Apr 30 19:26:30 2019 +0300

Merge branch 'maint-0.4.0'

 changes/bug29930 |  4 
 src/feature/nodelist/networkstatus.c | 18 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-04-29 Thread nickm 
commit 206d28ff152f2df5ccf966a5923804718f49b43b
Merge: efeb101b9 593d29920
Author: Nick Mathewson 
Date:   Mon Apr 29 10:15:11 2019 -0400

Merge branch 'maint-0.4.0'

 Makefile.am  | 2 +-
 changes/bug30263 | 3 +++
 2 files changed, 4 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/master] Merge branch 'maint-0.4.0'

2019-04-25 Thread asn 
commit 974c2674ebb8fb6716cc147e04eff6058094565f
Merge: 811a93f80 a39789a02
Author: George Kadianakis 
Date:   Thu Apr 25 15:47:07 2019 +0300

Merge branch 'maint-0.4.0'

 changes/bug30001| 7 +++
 src/feature/dircache/dircache.c | 2 +-
 src/test/test_dir_handle_get.c  | 2 +-
 3 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/master] Merge branch 'maint-0.4.0'

2019-04-18 Thread teor 
commit 4b8c77a590df699c56dcfd92e4e4839223f488dc
Merge: bffba9d26 24b68b477
Author: teor 
Date:   Fri Apr 19 12:00:59 2019 +1000

Merge branch 'maint-0.4.0'

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-04-18 Thread asn 
commit d867b7ae1dcd77ca7af64c3e5489644670b136f5
Merge: ef97e6c55 6a179b107
Author: George Kadianakis 
Date:   Thu Apr 18 13:22:23 2019 +0300

Merge branch 'maint-0.4.0'

 changes/diagnostic_28223_redux |  4 
 src/feature/dirparse/microdesc_parse.c | 17 -
 src/feature/nodelist/microdesc.c   | 28 
 src/lib/fdio/fdio.c|  4 
 4 files changed, 52 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/master] Merge branch 'maint-0.4.0'

2019-04-17 Thread teor 
commit ef97e6c5534c1e0266056aa063f0467d37bd8347
Merge: 82b690d7d c72f0cd5c
Author: teor 
Date:   Wed Apr 17 16:46:47 2019 +1000

Merge branch 'maint-0.4.0'

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-04-15 Thread asn 
commit 3f9efc5e88f4c0eaffb3f06ba58a99e8b5d59f83
Merge: 7b386f235 15591e1bb
Author: George Kadianakis 
Date:   Mon Apr 15 13:56:48 2019 +0300

Merge branch 'maint-0.4.0'

 changes/bug27199|  3 +++
 src/rust/Cargo.toml | 11 +++
 2 files changed, 14 insertions(+)



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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-04-11 Thread nickm 
commit 7dd247c5fd91962cf12ffc1c2aced0a3e8d01f29
Merge: 9fabf104e 40471d73e
Author: Nick Mathewson 
Date:   Thu Apr 11 17:05:45 2019 -0400

Merge branch 'maint-0.4.0'




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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-04-10 Thread nickm 
commit 3c64cfe649be78c738fa8175d94ad9a0db37ef87
Merge: 3be1e26b8 b2fc57426
Author: Nick Mathewson 
Date:   Wed Apr 10 11:52:12 2019 -0400

Merge branch 'maint-0.4.0'

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-04-10 Thread nickm 
commit 3be1e26b8d27b9baa89549fff56fadd2894ec00f
Merge: 60c46c6cd 412bcc5b2
Author: Nick Mathewson 
Date:   Wed Apr 10 11:31:44 2019 -0400

Merge branch 'maint-0.4.0'

 changes/bug30040   | 9 +
 src/ext/getdelim.c | 3 ++-
 2 files changed, 11 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/master] Merge branch 'maint-0.4.0'

2019-04-10 Thread teor 
commit a1d9f44971f2442a41a4d5fbed5aba28d872e15b
Merge: c28cdcc9b 454bdb22e
Author: teor 
Date:   Wed Apr 10 18:27:11 2019 +1000

Merge branch 'maint-0.4.0'

 changes/bug30041   |  5 +
 src/core/mainloop/connection.c |  4 
 src/lib/buf/buffers.c  | 11 +--
 3 files changed, 18 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/master] Merge branch 'maint-0.4.0'

2019-04-09 Thread nickm 
commit c28cdcc9bf5df9ed6479881a1fc4124a7b7a2676
Merge: 16041d791 ffdca3dd1
Author: Nick Mathewson 
Date:   Tue Apr 9 13:51:44 2019 -0400

Merge branch 'maint-0.4.0'

 src/test/test_util.c | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-04-09 Thread asn 
commit 16041d791873dc063a625e09fb62206d8ab2e6f4
Merge: 3d45079c2 c7cf49dc3
Author: George Kadianakis 
Date:   Tue Apr 9 12:25:18 2019 +0300

Merge branch 'maint-0.4.0'

 changes/bug29922 | 4 
 src/test/test_util.c | 9 +
 2 files changed, 13 insertions(+)

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-04-08 Thread teor 
commit 3d45079c27b94f073442f80b203f9787857c2d01
Merge: e4692fad9 92e8bdf29
Author: teor 
Date:   Tue Apr 9 11:36:59 2019 +1000

Merge branch 'maint-0.4.0'

 changes/bug28614_better_logging  |  6 ++
 changes/doc29121 |  3 +++
 doc/tor.1.txt| 14 +++---
 src/feature/nodelist/networkstatus.c |  7 +--
 4 files changed, 25 insertions(+), 5 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-04-05 Thread teor 
commit 4cffc7fe9cfff03a122ddecc3447136f8a82387b
Merge: f213a35b2 b100c9e98
Author: teor 
Date:   Sat Apr 6 12:23:25 2019 +1000

Merge branch 'maint-0.4.0'

 changes/29241_diagnostic |  4 
 changes/bug29241 |  6 ++
 src/lib/tls/tortls_nss.c | 40 
 3 files changed, 50 insertions(+)

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-04-05 Thread teor 
commit f213a35b2f7e14b14f4d23dd2084190050d3ca32
Merge: f021ca2d5 8b3b605a1
Author: teor 
Date:   Sat Apr 6 09:33:38 2019 +1000

Merge branch 'maint-0.4.0'

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-04-05 Thread asn 
commit 5584b6392d2e1f5bbaf9420e3cf5dfa6185d9d6c
Merge: 76f176397 2cc3c98bc
Author: George Kadianakis 
Date:   Fri Apr 5 14:57:06 2019 +0300

Merge branch 'maint-0.4.0'

 .travis.yml  | 13 ++---
 changes/bug30011 |  4 
 2 files changed, 14 insertions(+), 3 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-04-05 Thread asn 
commit 76f1763976948faab07a98048958e86a28a8ef29
Merge: 3393c8d51 7fe169a50
Author: George Kadianakis 
Date:   Fri Apr 5 14:55:22 2019 +0300

Merge branch 'maint-0.4.0'

 .travis.yml | 15 +++
 Makefile.am |  4 +++-
 changes/bug29036|  5 +
 changes/ticket29962 |  3 +++
 4 files changed, 22 insertions(+), 5 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-04-05 Thread asn 
commit 3393c8d510a5d62fefbc8c00e4b97d889d6f3143
Merge: b371ea5b0 217db9efe
Author: George Kadianakis 
Date:   Fri Apr 5 14:53:39 2019 +0300

Merge branch 'maint-0.4.0'

 changes/bug30021 | 8 
 src/lib/tls/tortls_openssl.c | 2 +-
 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/master] Merge branch 'maint-0.4.0'

2019-04-05 Thread asn 
commit 574c20767059a9c39b33181a4792ac4aa7c71ba4
Merge: 1779878f9 747b74c18
Author: George Kadianakis 
Date:   Fri Apr 5 14:51:33 2019 +0300

Merge branch 'maint-0.4.0'

 changes/ticket29357|  7 +++
 doc/tor.1.txt  | 15 +++
 src/app/config/config.c|  1 +
 src/app/config/or_options_st.h |  5 +
 src/core/mainloop/netstatus.c  |  4 
 src/test/test_mainloop.c   |  8 
 6 files changed, 40 insertions(+)

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-04-04 Thread nickm 
commit 0e7b34354a1789ff3b2d39a98ca8ebcb37ef4664
Merge: 0b6769a99 d016bbaa7
Author: Nick Mathewson 
Date:   Thu Apr 4 20:27:04 2019 -0400

Merge branch 'maint-0.4.0'

 changes/bug29959-040  |  3 +++
 src/feature/dirauth/dirvote.c | 21 ++---
 2 files changed, 13 insertions(+), 11 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-04-03 Thread asn 
commit 0b6769a99e4493a0b69fcbedda3febc6028391fb
Merge: 50341bb5b 42aae0e69
Author: George Kadianakis 
Date:   Wed Apr 3 17:59:46 2019 +0300

Merge branch 'maint-0.4.0'

 changes/ticket29897 | 3 +++
 src/feature/dircache/dircache.c | 5 +
 2 files changed, 4 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/master] Merge branch 'maint-0.4.0'

2019-04-03 Thread asn 
commit 50341bb5ba3e25b680b8b78b63debc8498112908
Merge: 4efbb5d2c 828f1829c
Author: George Kadianakis 
Date:   Wed Apr 3 17:55:41 2019 +0300

Merge branch 'maint-0.4.0'

 changes/bug29527 | 5 +
 1 file changed, 5 insertions(+)

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-04-03 Thread nickm 
commit 4efbb5d2c1cedd2ad6e8bf55e365c84bc99f4d66
Merge: ee6f54ff3 de76862fd
Author: Nick Mathewson 
Date:   Wed Apr 3 09:27:44 2019 -0400

Merge branch 'maint-0.4.0'

 changes/geoip-2019-04-02 | 4 +
 src/config/geoip | 10355 +
 src/config/geoip6|  2337 ++
 3 files changed, 7344 insertions(+), 5352 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-04-01 Thread teor 
commit 9014add25fd7bf4fa83e4409ab5d7b4416c872cc
Merge: f0e39df5c 9242f3288
Author: teor 
Date:   Tue Apr 2 11:45:39 2019 +1000

Merge branch 'maint-0.4.0'

 changes/bug29703 | 4 
 1 file 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/master] Merge branch 'maint-0.4.0'

2019-03-26 Thread teor 
commit 8991280f89be0cb157efcaec82880040fba4031b
Merge: 57999e330 6d188fb4c
Author: teor 
Date:   Wed Mar 27 12:31:37 2019 +1000

Merge branch 'maint-0.4.0'

 changes/bug29874| 4 
 src/lib/process/process_win32.c | 7 +--
 2 files changed, 5 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/master] Merge branch 'maint-0.4.0'

2019-03-26 Thread teor 
commit 57999e330b82fa3a360406dfb28b7a35fb50d602
Merge: beceb079e ca29cb397
Author: teor 
Date:   Wed Mar 27 10:02:55 2019 +1000

Merge branch 'maint-0.4.0'

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-03-26 Thread teor 
commit c72526f16870226379c64fbed9e7b25351723c53
Merge: 7502e5467 9ae8d663e
Author: teor 
Date:   Wed Mar 27 09:36:55 2019 +1000

Merge branch 'maint-0.4.0'

 changes/bug28925   |  4 
 src/core/mainloop/connection.c | 16 +++-
 src/core/mainloop/connection.h |  2 +-
 src/core/or/connection_or.c| 16 +---
 src/core/or/or_connection_st.h |  2 ++
 5 files changed, 31 insertions(+), 9 deletions(-)




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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-03-26 Thread asn 
commit 2790ee3685ac2d906cab99d1eac8f7a627b00d90
Merge: 613c5ff35 06951cb3f
Author: George Kadianakis 
Date:   Tue Mar 26 15:16:37 2019 +0200

Merge branch 'maint-0.4.0'

 changes/ticket29806  |  7 ++
 src/feature/dirauth/bwauth.c |  8 +-
 src/test/test_dir.c  | 59 
 3 files changed, 73 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/master] Merge branch 'maint-0.4.0'

2019-03-26 Thread teor 
commit 06426508655590fee73696a6d398d8ed7f9af1ed
Merge: 3d38d0ca2 4258728d5
Author: teor 
Date:   Tue Mar 26 19:16:06 2019 +1000

Merge branch 'maint-0.4.0'

 changes/ticket21377 |   4 ++
 src/feature/dircache/dircache.c |  42 +++-
 src/test/test_dir_handle_get.c  | 106 
 3 files changed, 151 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/master] Merge branch 'maint-0.4.0'

2019-03-26 Thread teor 
commit 3d38d0ca24915fc05e770f2d5be3fd38203b5210
Merge: ec736f872 828033001
Author: teor 
Date:   Tue Mar 26 16:57:04 2019 +1000

Merge branch 'maint-0.4.0'

 changes/cid1444119   | 3 +++
 src/feature/dircommon/consdiff.c | 2 +-
 2 files changed, 4 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/master] Merge branch 'maint-0.4.0'

2019-03-23 Thread nickm 
commit 91c24ad530c896d7bab1e1f485ac092512523243
Merge: 22e72eeaa 8bc3ac6a8
Author: Nick Mathewson 
Date:   Sat Mar 23 08:44:44 2019 -0400

Merge branch 'maint-0.4.0'

"ours" 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/master] Merge branch 'maint-0.4.0'

2019-03-22 Thread nickm 
commit 22e72eeaa78e84ca5b839690628de0db0c287d58
Merge: 15900ab70 4b79b43e3
Author: Nick Mathewson 
Date:   Fri Mar 22 11:17:10 2019 -0400

Merge branch 'maint-0.4.0'

 changes/bug29693   |  3 +++
 src/test/test_prob_distr.c | 15 +--
 2 files changed, 12 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/master] Merge branch 'maint-0.4.0'

2019-03-21 Thread nickm 
commit 938d97cb0d4acfdd1ea57ec0a3094bcc2101f13d
Merge: ca2656704 ebc7556dd
Author: Nick Mathewson 
Date:   Thu Mar 21 09:36:40 2019 -0400

Merge branch 'maint-0.4.0'

Ours 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/master] Merge branch 'maint-0.4.0'

2019-03-19 Thread teor 
commit ca265670441381938a50de2985aafc15ec5f2ad4
Merge: 2a49b27b9 3871fb732
Author: teor 
Date:   Wed Mar 20 09:48:21 2019 +1000

Merge branch 'maint-0.4.0'

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-03-19 Thread nickm 
commit a80131765a016032f46e09bff9d8b8e160618fe3
Merge: 4c22c1113 de5ab1ef4
Author: Nick Mathewson 
Date:   Tue Mar 19 09:32:24 2019 -0400

Merge branch 'maint-0.4.0'

 src/test/test_shared_random.c | 4 +++-
 1 file 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/master] Merge branch 'maint-0.4.0'

2019-03-18 Thread teor 
commit 4c22c11136bd05cceccb13ef00f2a78780c83be1
Merge: 0aaeec19e b4483edce
Author: teor 
Date:   Tue Mar 19 15:43:42 2019 +1000

Merge branch 'maint-0.4.0'

 changes/bug29530_035 | 5 +
 1 file changed, 5 insertions(+)

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-03-15 Thread nickm 
commit 677384e276a68993e3f48b949ef47f3a5cf1e324
Merge: 1cffacdaf 1547fd99a
Author: Nick Mathewson 
Date:   Fri Mar 15 08:59:30 2019 -0400

Merge branch 'maint-0.4.0'

 changes/bug28656|  3 +++
 src/feature/nodelist/nodelist.c | 16 +++-
 2 files changed, 14 insertions(+), 5 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-03-15 Thread nickm 
commit 1cffacdaf5eac1929b47e827c3654a7e97b76687
Merge: af56dece0 560ba98dd
Author: Nick Mathewson 
Date:   Fri Mar 15 08:54:39 2019 -0400

Merge branch 'maint-0.4.0'

 src/test/test_shared_random.c | 17 ++---
 1 file changed, 10 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/master] Merge branch 'maint-0.4.0'

2019-03-15 Thread nickm 
commit af56dece09e116abf671f8723c6d0a503f69167e
Merge: aee65084b 94523bffd
Author: Nick Mathewson 
Date:   Fri Mar 15 08:53:03 2019 -0400

Merge branch 'maint-0.4.0'

 changes/bug29665 | 7 +++
 src/core/or/circuituse.c | 4 
 2 files changed, 11 insertions(+)

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-03-13 Thread teor 
commit de616694257f19d5d2bd977e543ba98580d35be9
Merge: cab93930d feb7253df
Author: teor 
Date:   Thu Mar 14 07:00:51 2019 +1000

Merge branch 'maint-0.4.0'

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-03-12 Thread nickm 
commit cd52e139469bad103cd6ad02cbdf3c58bfd77b26
Merge: 18a4f535d ec2a2a6b7
Author: Nick Mathewson 
Date:   Tue Mar 12 14:22:08 2019 -0400

Merge branch 'maint-0.4.0'

 changes/bug28525 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-03-12 Thread asn 
commit 18a4f535d3ecf56d70fe585bbdb031bd67a96374
Merge: 61adcb22c 0ce32affc
Author: George Kadianakis 
Date:   Tue Mar 12 18:11:53 2019 +0200

Merge branch 'maint-0.4.0'

 changes/bug28525  |  8 
 src/lib/net/address.c | 19 +++
 src/test/test_addr.c  | 18 ++
 3 files changed, 41 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/master] Merge branch 'maint-0.4.0'

2019-03-12 Thread nickm 
commit 1c9b6292840dd5517578f398d517befbc99bd025
Merge: 733afb52a 9c9214f2c
Author: Nick Mathewson 
Date:   Tue Mar 12 11:03:47 2019 -0400

Merge branch 'maint-0.4.0'

 changes/bug29706_minimal  |   4 +
 changes/bug29706_refactor |   4 +
 src/feature/dirauth/shared_random.c   |   8 +-
 src/feature/dirauth/shared_random.h   |   2 +-
 src/feature/dirauth/shared_random_state.c |  60 ++--
 src/feature/dirauth/shared_random_state.h |   2 +
 src/test/test_shared_random.c | 245 +++---
 7 files changed, 290 insertions(+), 35 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-03-11 Thread nickm 
commit 733afb52a8267d4b74e9437c71a0d8c65a9b954a
Merge: 911f95ed9 a9c84bfd3
Author: Nick Mathewson 
Date:   Mon Mar 11 09:45:48 2019 -0400

Merge branch 'maint-0.4.0'

 src/lib/time/compat_time.c | 4 +++-
 1 file 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/master] Merge branch 'maint-0.4.0'

2019-03-08 Thread nickm 
commit 911f95ed9203225f74b16b28dc46c76caf57f227
Merge: e47e60c12 c40d53ab3
Author: Nick Mathewson 
Date:   Fri Mar 8 10:25:57 2019 -0500

Merge branch 'maint-0.4.0'

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-03-07 Thread teor 
commit df279880f8d46db6299b40a682de6a17809573ce
Merge: d3fc9aef9 968d2b87c
Author: teor 
Date:   Fri Mar 8 14:12:00 2019 +1000

Merge branch 'maint-0.4.0'

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-03-07 Thread nickm 
commit d3fc9aef93a4a5d9732df814c356183c8d5571a1
Merge: 82e1ec408 3af943dcd
Author: Nick Mathewson 
Date:   Thu Mar 7 08:57:02 2019 -0500

Merge branch 'maint-0.4.0'

 changes/bug29144   | 5 +
 src/core/mainloop/connection.c | 2 +-
 2 files changed, 6 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/master] Merge branch 'maint-0.4.0'

2019-03-07 Thread nickm 
commit 82e1ec4087de41d25e35f838843074cbef1ca6cc
Merge: 918bda25a d8409ccb7
Author: Nick Mathewson 
Date:   Thu Mar 7 08:34:46 2019 -0500

Merge branch 'maint-0.4.0'

 .appveyor.yml| 23 +--
 changes/bug29601 |  6 ++
 2 files changed, 27 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/master] Merge branch 'maint-0.4.0'

2019-03-06 Thread nickm 
commit 918bda25adb0e81608bb9c0caeed7eaf4345d263
Merge: db2e916af 9b4ecbaa7
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:48 2019 -0500

Merge branch 'maint-0.4.0'

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-03-05 Thread nickm 
commit f1890707ccfd4c665ee477655c663accb8891279
Merge: d24acc008 a999cb43d
Author: Nick Mathewson 
Date:   Tue Mar 5 13:00:07 2019 -0500

Merge branch 'maint-0.4.0'

 changes/ticket29631  |  4 
 src/core/or/protover.h   | 22 +++---
 src/rust/protover/ffi.rs |  1 +
 3 files changed, 16 insertions(+), 11 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-02-28 Thread teor 
commit 2d5c6cddc434cb04ca8a1ce1f2922d6f639d229a
Merge: 9256b02cc 955a62239
Author: teor 
Date:   Fri Mar 1 14:17:54 2019 +1000

Merge branch 'maint-0.4.0'

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-02-28 Thread nickm 
commit d5f61375470c9c9ee949e4ff03c7a4cbd51b7224
Merge: cec555f44 dc19d65c3
Author: Nick Mathewson 
Date:   Thu Feb 28 11:22:06 2019 -0500

Merge branch 'maint-0.4.0'

 changes/bug29562|  4 
 src/feature/client/transports.c | 29 ++---
 2 files changed, 18 insertions(+), 15 deletions(-)

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

  1   2   >