commit ed2cbbf71680fd2be67eb7b74c44572e58895d72
Merge: d0d2aba9f f3fa22bf1
Author: Nick Mathewson
Date: Mon Feb 10 14:17:09 2020 -0500
Merge branch 'maint-0.4.0' into release-0.4.0
changes/ticket33212 | 4
src/rust/protover/protover.rs | 2 +-
2 files changed, 5
commit d0d2aba9f32fd6725f84f5d8a91ef6798e3dbb73
Merge: 8e3e8b0a1 65825018c
Author: teor
Date: Thu Jan 30 07:55:01 2020 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug29819 | 8
src/lib/sandbox/sandbox.c | 40 ++--
2
commit 8e3e8b0a1c27a7643706259ff7413e4e2d359124
Merge: 262906e99 026f068bb
Author: teor
Date: Thu Jan 16 10:00:36 2020 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
changes/ticket32407 | 4
src/core/mainloop/mainloop.c | 4
commit 262906e99430f41012f4d699d2ac3eecf3a8c1dd
Merge: c4eb6740f d96b35d66
Author: teor
Date: Fri Dec 20 10:12:39 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
.travis.yml | 10 --
changes/ticket32240 | 4
changes/ticket32242 | 2 ++
3 files changed, 10
commit c4eb6740f9e36fca9f2fdd4ea1620047ad67b045
Merge: 793c4a3c9 748117298
Author: teor
Date: Mon Dec 16 08:16:08 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
.travis.yml | 9 +
changes/ticket32629 | 4
2 files changed, 9 insertions(+), 4 deletions(-)
commit 793c4a3c922765f92b7eabc4aa179043e61105a8
Merge: 39344e410 b9504f788
Author: Nick Mathewson
Date: Mon Dec 9 16:04:22 2019 -0500
Merge branch 'maint-0.4.0' into release-0.4.0
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 4de31504b0fe5b679b929981d0eb60b878859d7f
Merge: c3a3539da c7ca3fc18
Author: Nick Mathewson
Date: Fri Dec 6 16:02:08 2019 -0500
Merge branch 'maint-0.4.0' into release-0.4.0
changes/geoip-2019-12-03 | 4 +
src/config/geoip | 13933
commit c3a3539da82177e41275dd8a2761b43b75fd7a9c
Merge: 948e9bf6c e66533bef
Author: Nick Mathewson
Date: Thu Dec 5 13:33:04 2019 -0500
Merge branch 'maint-0.4.0' into release-0.4.0
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit aa47cb6e0f6edb2adeb357d2da1b090a11430f96
Merge: 03dc0e19a 92fb09906
Author: teor
Date: Thu Dec 5 10:13:57 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug31571| 7 +++
changes/bug31810| 4
src/lib/err/backtrace.c
commit 03dc0e19a1a498c7df390899e01b7830e3186b85
Merge: c88fce132 febbc236d
Author: teor
Date: Tue Dec 3 12:46:47 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
.travis.yml | 14 +-
changes/ticket32500 | 5 +
2 files changed, 14 insertions(+), 5
commit c88fce1323205db4809bf2a69fa9a29c71ffb4c1
Merge: 76177368c 055f5d4d1
Author: teor
Date: Mon Nov 25 12:37:03 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug30344| 4
changes/bug31939| 3 +++
changes/bug32108
commit 76177368c97c912cc1507e3eeed361c3ca169955
Merge: c0543ac32 329aa1c48
Author: Nick Mathewson
Date: Mon Nov 11 10:14:04 2019 -0500
Merge branch 'maint-0.4.0' into release-0.4.0
changes/geoip-2019-11-06 | 4 +
src/config/geoip | 15751
commit c0543ac327e63d092e96b5084dc4f3a4c7066050
Merge: e24152319 29940511e
Author: teor
Date: Mon Nov 11 14:19:43 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
.appveyor.yml| 2 +-
changes/bug32449 | 5 +
2 files changed, 6 insertions(+), 1 deletion(-)
commit e241523195d2bc3ac03383aab9c88e612633d461
Merge: ff601da0d 03e77ef03
Author: teor
Date: Wed Nov 6 11:19:42 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug30916 | 4 +++
changes/bug31107 | 4 +++
changes/bug31408 | 5
commit ff601da0d18622dad0bbf901fea41d7bdd248ba2
Merge: d945a8894 54e2d0dc2
Author: teor
Date: Tue Oct 29 08:26:44 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
.travis.yml | 7 ---
changes/ticket32241 | 2 ++
2 files changed, 6 insertions(+), 3 deletions(-)
commit d945a88945a8a20666056a1da31f37d9ad8b50a9
Merge: d4d189964 e56e7e865
Author: teor
Date: Fri Oct 25 10:56:02 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
.travis.yml| 12 ++--
changes/ticket31919_bionic | 5 +
2 files changed, 15
commit d4d189964aa81fe033dd8910bbf73b132d5c7da5
Merge: 2da3e3f70 57acdaa3f
Author: teor
Date: Wed Oct 23 08:47:12 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
.appveyor.yml | 6 +++---
.travis.yml| 6 --
changes/bug12399
commit 2da3e3f70922fb3855deaf4e995b5eb857deb5e5
Merge: af3ab180b 4013e50cb
Author: Nick Mathewson
Date: Tue Oct 22 12:10:30 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
.appveyor.yml| 12
changes/bug31884 | 3 +++
2 files changed, 15 insertions(+)
commit af3ab180bf89c59402e90760ec02cc91ddf94573
Merge: f05cfda3e 9bb0ca122
Author: teor
Date: Tue Oct 22 20:48:09 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
.travis.yml | 12 +++-
changes/ticket32177 | 3 +++
2 files changed, 10 insertions(+), 5
commit f05cfda3e2744bad25588c47aa56c9c2a96a2f85
Merge: 3ab58706f 89ead08ee
Author: Nick Mathewson
Date: Mon Oct 21 18:44:44 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
.appveyor.yml | 8
changes/ticket32086 | 3 +++
2 files changed, 7 insertions(+), 4
commit 3ab58706f775d8e3080a75dfa4b3e5735778d436
Merge: c7d3bedf3 e483257e1
Author: teor
Date: Thu Oct 17 14:52:02 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
.travis.yml | 87 +++--
changes/ticket30860 | 3 ++
commit c7d3bedf310443da2cbbdd8b0e8e182a15b7d64a
Merge: 68a002c60 a74c18069
Author: Nick Mathewson
Date: Wed Oct 2 08:01:34 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
changes/geoip-2019-10-01 | 4 +
src/config/geoip | 35299
commit 68a002c6031f52c97f1d8acbe0c42e53da452351
Merge: 2b97b1464 9e674d0eb
Author: Nick Mathewson
Date: Tue Sep 17 21:28:37 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug31657| 5 +
src/feature/client/entrynodes.c | 3 ++-
commit 2b97b1464bba12d54e1446e70331cea2b904afb7
Merge: 1f19b5528 a1f97bb25
Author: Nick Mathewson
Date: Tue Sep 17 21:26:32 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
changes/doc31089| 4 +
contrib/operator-tools/tor-exit-notice.html | 177
commit 1f19b5528f90eed57fdb4a7385eea14a6e5e84de
Merge: 7b348e2ef ef3543558
Author: Nick Mathewson
Date: Tue Sep 17 18:58:43 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
changes/ticket31673 | 3 +++
src/lib/meminfo/meminfo.c | 7 ---
2 files changed, 7 insertions(+),
commit 7b348e2efd0ef702554ce1e44cec958d8dd25dd2
Merge: b17e3f6a3 34bab120d
Author: Nick Mathewson
Date: Tue Sep 17 18:56:52 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
changes/ticket31687_1 | 4
changes/ticket31687_2 | 5 +
commit b17e3f6a3a762de9a26c90385dddc36a9f4751d0
Merge: 221be3651 896a1ac50
Author: teor
Date: Thu Sep 5 14:47:58 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
Makefile.am | 2 +-
changes/ticket31554 | 4
2 files changed, 5 insertions(+), 1 deletion(-)
commit 221be36512c6bb49519de1658057f331b59bf3ad
Merge: eda8e0631 1203e137b
Author: teor
Date: Thu Sep 5 12:05:08 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug30649 | 4
src/core/or/circuitpadding.c | 33 +++--
2 files
commit eda8e06319b89bc5ac90045a0af0afbb3140bdfd
Merge: d05db8601 a52a5e009
Author: teor
Date: Fri Aug 30 23:33:06 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug30894 | 4
changes/bug31003 | 4
changes/ticket30871
commit d05db86010bc54d5c6dba525ded3028b5839ceb2
Merge: 2ecd36f3c 357e9a6f2
Author: George Kadianakis
Date: Tue Aug 27 11:49:36 2019 +0300
Merge branch 'maint-0.4.0' into release-0.4.0
.travis.yml | 2 +-
changes/bug31463 | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
commit 2ecd36f3c31378a8283d25a97ab81f01f2c52b2f
Merge: 552688c5c 90f4ed233
Author: Nick Mathewson
Date: Mon Aug 19 10:37:21 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
changes/ticket31406 | 3 +++
src/app/config/auth_dirs.inc | 2 +-
2 files changed, 4
commit 552688c5ccf23f48582a804a01f972e8fc715c8f
Merge: 3d04e0bf7 20943d00f
Author: teor
Date: Mon Aug 12 13:10:10 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug22619 | 3 +++
changes/bug29034 | 5 +
changes/bug29670
commit 3d04e0bf707ef55ced65966b61907962f8d9f8e4
Merge: 88276ee02 bad001080
Author: teor
Date: Sat Aug 10 07:26:26 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug30561 | 6 ++
changes/bug30781 | 4
changes/bug31343
commit cac910c42d35233df6983869349f358b0ae1aabc
Merge: 56fdd4f16 e27a74b1b
Author: teor
Date: Thu Aug 8 11:11:31 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
.travis.yml| 24 +---
changes/chutney_ci | 3 +++
2 files changed, 20 insertions(+), 7
commit 88276ee02c10c202a88766707ecb5e92858270ad
Merge: cac910c42 0a661cde1
Author: teor
Date: Thu Aug 8 11:19:50 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
.travis.yml | 8 +---
changes/ticket30591 | 3 +++
changes/ticket30694 | 3 +++
3 files changed, 11
commit 56fdd4f169be02aa9372b659bc349230a3009ff7
Merge: a219449b9 2a42d6be2
Author: Nick Mathewson
Date: Mon Jul 1 14:25:12 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
changes/ticket28795 | 5 +
src/app/config/fallback_dirs.inc | 567
commit a219449b9cd995cde9723ff9023f93cca181c060
Merge: 50dcbf261 afa2c39ba
Author: Nick Mathewson
Date: Tue Jun 11 10:17:18 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
changes/geoip-2019-06-10 | 4 +
src/config/geoip | 14985
commit 50dcbf26122d82eb8a6e6b41db82d88608eadd32
Merge: 66c307751 4ca18fde9
Author: teor
Date: Tue Jun 11 14:52:32 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
___
tor-commits mailing list
tor-commits@lists.torproject.org
https
commit 66c307751695eb01b6b535462515e66a53ee55a2
Merge: 0fe3b373a c8447f95e
Author: Nick Mathewson
Date: Mon Jun 10 18:44:31 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
.travis.yml | 4
changes/bug30744 | 3 +++
2 files changed, 7 insertions(+)
commit 0fe3b373acfff401059bcbf13ed1503aa19d0c69
Merge: 463ded569 430dd2da6
Author: Nick Mathewson
Date: Mon Jun 10 18:33:26 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
.travis.yml | 2 ++
changes/bug30713| 5 +
src/test/test_rebind.py | 7 +++
commit 463ded569c13f633b12d74ad0048b0b367a511b4
Merge: 121d271dc 6a6f7eb67
Author: Nick Mathewson
Date: Wed Jun 5 16:24:10 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
.travis.yml| 23 ++
changes/bug30189 | 4
commit 121d271dc6db82b0c49125b7160ed320e6398682
Merge: 63e0599c5 00108b75d
Author: George Kadianakis
Date: Wed May 29 21:20:02 2019 +0300
Merge branch 'maint-0.4.0' into release-0.4.0
changes/ticket29702 | 4
src/test/test_key_expiration.sh | 3 ++-
commit 63e0599c5710e04ecb98ff87c09d613feeda2620
Merge: 34e03b9ec c7f9f7e54
Author: Nick Mathewson
Date: Fri May 17 08:10:16 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
changes/geoip-2019-05-13 | 4 +
src/config/geoip | 15407
commit 34e03b9ecca3e5e93623153d0e7311814d5aa1cd
Merge: 72e799d28 7e3f7ab40
Author: Nick Mathewson
Date: Wed May 15 07:41:42 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 72e799d28e9a035805ad03b12ccf275418f56df5
Merge: de01c0629 cd264e145
Author: George Kadianakis
Date: Wed May 15 13:46:19 2019 +0300
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug30475| 4
src/feature/hs/hs_service.c | 4 ++--
2 files changed, 6
commit de01c0629659021d8201fcfd6fa97550c28056d9
Merge: bf071e34a 2b54733dc
Author: Nick Mathewson
Date: Thu May 2 14:33:22 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 5d0c1ba019a2b88129e46879df2aff5e1acec58c
Merge: 672c72d7d cafb99981
Author: Nick Mathewson
Date: Tue Apr 30 15:54:21 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 603074ea18e5435e1cfe1b0171792728974bc4b0
Merge: a5b323acb e1d4e2bad
Author: George Kadianakis
Date: Tue Apr 30 19:26:30 2019 +0300
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug29930 | 4
src/feature/nodelist/networkstatus.c | 18
commit 83f10c77dabc242c3e28740a4336741ff564b22e
Merge: 88d6c2568 593d29920
Author: Nick Mathewson
Date: Mon Apr 29 10:15:11 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
Makefile.am | 2 +-
changes/bug30263 | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
commit 88d6c2568d4a1ccc6fd3865e95bfb5243bf90395
Merge: e8b26bb71 a39789a02
Author: George Kadianakis
Date: Thu Apr 25 15:47:07 2019 +0300
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug30001| 7 +++
src/feature/dircache/dircache.c | 2 +-
commit e8b26bb71b3465bd770f6ecff5be1d4e9a26d460
Merge: 3444371dd 24b68b477
Author: teor
Date: Fri Apr 19 12:00:55 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
___
tor-commits mailing list
tor-commits@lists.torproject.org
https
commit 3444371dd9386dc37e6dc7df4d7d151429626c91
Merge: ba15b2f23 6a179b107
Author: George Kadianakis
Date: Thu Apr 18 13:22:23 2019 +0300
Merge branch 'maint-0.4.0' into release-0.4.0
changes/diagnostic_28223_redux | 4
src/feature/dirparse/microdesc_parse.c | 17
commit ba15b2f238840d6e594976a39085f710c676e384
Merge: 6b8d01693 c72f0cd5c
Author: teor
Date: Wed Apr 17 16:46:44 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
.travis.yml | 2 +-
changes/ticket30117 | 4
2 files changed, 5 insertions(+), 1 deletion(-)
commit 6b8d01693a5c1c993420bd013a2cc0b768095b35
Merge: 5ae138946 15591e1bb
Author: George Kadianakis
Date: Mon Apr 15 13:56:48 2019 +0300
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug27199| 3 +++
src/rust/Cargo.toml | 11 +++
2 files changed, 14 insertions(+)
commit 5ae1389465f9be45530c8e07f7870e021705fe31
Merge: dac18e0b2 40471d73e
Author: Nick Mathewson
Date: Thu Apr 11 17:06:26 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit dcce26331cc7e84a04f907b1bc790596bf9a759f
Merge: 4000666ee b2fc57426
Author: Nick Mathewson
Date: Wed Apr 10 11:52:23 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit bfdbc0ccd786fd90d178f5b72c59ac37db36711e
Merge: e9b3b5c3f 412bcc5b2
Author: Nick Mathewson
Date: Wed Apr 10 11:31:44 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug30040 | 9 +
src/ext/getdelim.c | 3 ++-
2 files changed, 11 insertions(+), 1
commit e9b3b5c3fcaff1914c14dd67f0fdb95e0cb42fee
Merge: aa26fd308 454bdb22e
Author: teor
Date: Wed Apr 10 18:27:07 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug30041 | 5 +
src/core/mainloop/connection.c | 4
src/lib/buf/buffers.c |
commit aa26fd308dfa0bb3e55e9611a94ed92976a6c507
Merge: 91ff811ad ffdca3dd1
Author: Nick Mathewson
Date: Tue Apr 9 13:51:44 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
src/test/test_util.c | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
commit 91ff811ad134f0fc68271dc09eaa651fc4e68d7f
Merge: 2fd02c82e c7cf49dc3
Author: George Kadianakis
Date: Tue Apr 9 12:25:18 2019 +0300
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug29922 | 4
src/test/test_util.c | 9 +
2 files changed, 13 insertions(+)
commit 2fd02c82edbf98f14ea0ee1a8c4d48ccdb75551f
Merge: a51f5b9b3 92e8bdf29
Author: teor
Date: Tue Apr 9 11:36:55 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug28614_better_logging | 6 ++
changes/doc29121 | 3 +++
doc/tor.1.txt
commit a51f5b9b3631fea573229787f463b2b2c2ffb5c3
Merge: 6428fa359 b100c9e98
Author: teor
Date: Sat Apr 6 12:16:01 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
changes/29241_diagnostic | 4
changes/bug29241 | 6 ++
src/lib/tls/tortls_nss.c | 40
commit 6428fa35922d3debedb24d2098bd16c51ec21e69
Merge: 8a158b82b 8b3b605a1
Author: teor
Date: Sat Apr 6 09:33:33 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
___
tor-commits mailing list
tor-commits@lists.torproject.org
https
commit 8a158b82ba8a36ab32508a3d941270fd32e6939b
Merge: 0ba45b297 071a000d6
Author: George Kadianakis
Date: Fri Apr 5 16:45:36 2019 +0300
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug29500 | 3 +
src/core/or/circuitpadding.c | 3 +-
commit 0ba45b2977190516cecf7da08f1bb4045aa92c5b
Merge: 5ac287877 2cc3c98bc
Author: George Kadianakis
Date: Fri Apr 5 14:57:06 2019 +0300
Merge branch 'maint-0.4.0' into release-0.4.0
.travis.yml | 13 ++---
changes/bug30011 | 4
2 files changed, 14 insertions(+), 3
commit 5ac28787700862d242e74aab338db2a484f4c106
Merge: f9f6718c5 7fe169a50
Author: George Kadianakis
Date: Fri Apr 5 14:55:22 2019 +0300
Merge branch 'maint-0.4.0' into release-0.4.0
.travis.yml | 15 +++
Makefile.am | 4 +++-
changes/bug29036| 5 +
commit f9f6718c50ab2c8aead0bcf9b64f91ca1840b367
Merge: 4bc88a266 217db9efe
Author: George Kadianakis
Date: Fri Apr 5 14:53:39 2019 +0300
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug30021 | 8
src/lib/tls/tortls_openssl.c | 2 +-
2 files changed, 9
commit 4bc88a266a333eb58352c1c5fb87acb86cde05de
Merge: 8a010c8b8 747b74c18
Author: George Kadianakis
Date: Fri Apr 5 14:51:33 2019 +0300
Merge branch 'maint-0.4.0' into release-0.4.0
changes/ticket29357| 7 +++
doc/tor.1.txt | 15 +++
commit 8a010c8b833dd5045e815c476afaf3632a8a29a3
Merge: de0babab9 d016bbaa7
Author: Nick Mathewson
Date: Thu Apr 4 20:27:04 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug29959-040 | 3 +++
src/feature/dirauth/dirvote.c | 21 ++---
2 files
commit de0babab9b0917bdee45907d3ec6f0ea74f55cbc
Merge: 33e0c0310 42aae0e69
Author: George Kadianakis
Date: Wed Apr 3 17:59:46 2019 +0300
Merge branch 'maint-0.4.0' into release-0.4.0
changes/ticket28816 | 4
changes/ticket29897 | 3 +++
commit 33e0c03103bbcde79a5bec2ee7857e837937daf2
Merge: eb3b4dcd7 828f1829c
Author: George Kadianakis
Date: Wed Apr 3 17:55:41 2019 +0300
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug29527 | 5 +
configure.ac | 5 +
2 files changed, 10 insertions(+)
commit eb3b4dcd792972b59dbbe2aec79f292d3eeab73f
Merge: 9452833fc de76862fd
Author: Nick Mathewson
Date: Wed Apr 3 09:27:44 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
changes/geoip-2019-04-02 | 4 +
src/config/geoip | 10355
commit 9452833fc3249eb7f27b1724ff3f062cdd0b1ee2
Merge: bf2b8fcb4 9242f3288
Author: teor
Date: Tue Apr 2 11:45:35 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug29703 | 4
1 file changed, 4 insertions(+)
___
commit bf2b8fcb450de46603803e9b22a047c53e233f6f
Merge: e3e38b5ba 6d188fb4c
Author: teor
Date: Wed Mar 27 12:31:33 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug29874| 4
src/lib/process/process_win32.c | 7 +--
2 files changed, 5
commit e3e38b5ba1033512791ecae2a01278300c75c3c4
Merge: 571a7d591 ca29cb397
Author: teor
Date: Wed Mar 27 10:02:51 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
___
tor-commits mailing list
tor-commits@lists.torproject.org
https
commit 571a7d59176fa12230edd9e97eba975c7bfc8386
Merge: fa9e0963c 9ae8d663e
Author: teor
Date: Wed Mar 27 09:36:50 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug28925 | 4
src/core/mainloop/connection.c | 16 +++-
commit fa9e0963cff97dc0ccf60c7ab68e21be4641983f
Merge: 1cd59525c 06951cb3f
Author: George Kadianakis
Date: Tue Mar 26 15:16:37 2019 +0200
Merge branch 'maint-0.4.0' into release-0.4.0
changes/ticket29806 | 7 ++
src/feature/dirauth/bwauth.c | 8 +-
src/test/test_dir.c
commit 1cd59525cc7d16fbe7c3cb4cc006de279035ecfa
Merge: 08c479241 4258728d5
Author: teor
Date: Tue Mar 26 19:16:02 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
changes/ticket21377 | 4 ++
src/feature/dircache/dircache.c | 42 +++-
commit 08c4792413d7ea8eca5ef8f1325ecad0d1f6e4ab
Merge: 9c12558af 828033001
Author: teor
Date: Tue Mar 26 16:56:59 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
changes/cid1444119 | 3 +++
src/feature/dircommon/consdiff.c | 2 +-
2 files changed, 4 insertions(+),
commit 9c12558af595281708c4fab5705c5395134f45e4
Merge: eaa34dd6b 8bc3ac6a8
Author: Nick Mathewson
Date: Sat Mar 23 08:45:07 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 63b7cc92a71c945044f47e035987daea64addaf7
Merge: 2cdb69103 4b79b43e3
Author: Nick Mathewson
Date: Fri Mar 22 11:17:10 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug29693 | 3 +++
src/test/test_prob_distr.c | 15 +--
2 files changed, 12
commit 2ee184baccea01b47ea9510f1aeacde71fc5e6b7
Merge: 744ba41ed ebc7556dd
Author: Nick Mathewson
Date: Thu Mar 21 09:36:55 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 53f204bfe01943828bfe9782de9dc4a277bc0886
Merge: 544a61355 3871fb732
Author: teor
Date: Wed Mar 20 09:48:17 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
___
tor-commits mailing list
tor-commits@lists.torproject.org
https
commit 544a613556f7d868e2c84122768490dd4e6e2d52
Merge: fcf8c1143 de5ab1ef4
Author: Nick Mathewson
Date: Tue Mar 19 09:32:24 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
src/test/test_shared_random.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit fcf8c1143b1997e0f3cc00717bfe0846f088f71a
Merge: dfb8f0fee b4483edce
Author: teor
Date: Tue Mar 19 15:43:38 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug29530_035 | 5 +
1 file changed, 5 insertions(+)
___
commit dfb8f0feeb587b49d2203cdffdf42a0480767064
Merge: aed893798 1547fd99a
Author: Nick Mathewson
Date: Fri Mar 15 08:59:30 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug28656| 3 +++
src/feature/nodelist/nodelist.c | 16 +++-
2 files
commit aed893798f5cd9a08ac0440a8970d33ce133d068
Merge: 0fced1949 560ba98dd
Author: Nick Mathewson
Date: Fri Mar 15 08:54:39 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
src/test/test_shared_random.c | 17 ++---
1 file changed, 10 insertions(+), 7 deletions(-)
commit 0fced1949ade6e40ca215463f46d6bba14c8e616
Merge: 609b72fde 94523bffd
Author: Nick Mathewson
Date: Fri Mar 15 08:53:03 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug29665 | 7 +++
src/core/or/circuituse.c | 4
2 files changed, 11 insertions(+)
commit 609b72fde3395a71c641bd701bfd95cb32c8ecf2
Merge: ea84d62bc feb7253df
Author: teor
Date: Thu Mar 14 07:00:47 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
___
tor-commits mailing list
tor-commits@lists.torproject.org
https
commit ea84d62bc247bfbde069cad04769f3497bfbbac9
Merge: ab34f49be ec2a2a6b7
Author: Nick Mathewson
Date: Tue Mar 12 14:22:08 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug28525 | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
commit ab34f49be949db051a64e70cc68e24cf6de576ec
Merge: feda2231a 0ce32affc
Author: George Kadianakis
Date: Tue Mar 12 18:11:53 2019 +0200
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug28525 | 8
src/lib/net/address.c | 19 +++
commit feda2231a28a4e939c7d40eccd7643a07b659b52
Merge: d1a1be822 9c9214f2c
Author: Nick Mathewson
Date: Tue Mar 12 11:03:47 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug29706_minimal | 4 +
changes/bug29706_refactor | 4 +
commit d1a1be822eb97f7518338da0eef82965b31f0916
Merge: 31a9caa27 a9c84bfd3
Author: Nick Mathewson
Date: Mon Mar 11 09:45:48 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
src/lib/time/compat_time.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit 31a9caa274a3fbb57f82f2264028b9cabc56718f
Merge: 20a25b1ca c40d53ab3
Author: Nick Mathewson
Date: Fri Mar 8 10:25:57 2019 -0500
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug29204 | 4
src/core/or/circuitpadding.c | 21 +
2 files
commit 20a25b1cad603b2490d6e3a1e345ef1edc3bb8dc
Merge: 1128eec83 968d2b87c
Author: teor
Date: Fri Mar 8 14:11:53 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
___
tor-commits mailing list
tor-commits@lists.torproject.org
https
commit 1128eec8368780db19666561bd3e9f2bbde88c11
Merge: 9152692b9 3af943dcd
Author: Nick Mathewson
Date: Thu Mar 7 08:57:00 2019 -0500
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug29144 | 5 +
src/core/mainloop/connection.c | 2 +-
2 files changed, 6
commit 9152692b99a92c40278faa5fd78fca8f5c6d17f7
Merge: 5c78bd322 d8409ccb7
Author: Nick Mathewson
Date: Thu Mar 7 08:34:44 2019 -0500
Merge branch 'maint-0.4.0' into release-0.4.0
.appveyor.yml| 23 +--
changes/bug29601 | 6 ++
2 files changed, 27
commit 5c78bd32246fb4c3cb966474b135ddb2dc1ad57f
Merge: ea1de8443 9b4ecbaa7
Author: Nick Mathewson
Date: Wed Mar 6 14:29:45 2019 -0500
Merge branch 'maint-0.4.0' into release-0.4.0
changes/geoip-2019-03-04 | 4 +
src/config/geoip | 12163
commit ea1de844323e9eecdce833e24bcf7fda130f3b3e
Merge: 5529449bb a999cb43d
Author: Nick Mathewson
Date: Tue Mar 5 13:00:05 2019 -0500
Merge branch 'maint-0.4.0' into release-0.4.0
changes/ticket29631 | 4
src/core/or/protover.h | 22 +++---
commit 5529449bb26aa4c20fdd7f9d09424840c2138596
Merge: 35a2590f2 955a62239
Author: teor
Date: Fri Mar 1 14:17:41 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
___
tor-commits mailing list
tor-commits@lists.torproject.org
https
1 - 100 of 112 matches
Mail list logo
