[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 155b0f5521b12c17d7e5b500c6aa7ed20fcacc12 Merge: f56645917 0c9cd7c48 Author: Nick Mathewson Date: Wed Mar 6 14:29:33 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/geoip-2019-03-04 | 4 + src/config/geoip | 12163

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit f56645917e6c4743b285eb82e797accb3723399a Merge: 6a61a020e 76b55fde8 Author: teor Date: Fri Mar 1 14:16:22 2019 +1000 Merge branch 'maint-0.3.3' into maint-0.3.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 6a61a020eefa74b8466fa043f95391d37c06fcf6 Merge: 524731503 be71cce9f Author: teor Date: Thu Feb 28 10:49:19 2019 +1000 Merge branch 'maint-0.3.3' into maint-0.3.4 src/test/test_shared_random.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 524731503e0a885ab2dbb778831aa79875f8edae Merge: 1a194beb2 3313444ef Author: teor Date: Thu Feb 28 10:45:44 2019 +1000 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug29599 | 3 +++ src/test/test_shared_random.c | 5 +++-- 2 files changed, 6 insertions(+), 2

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 1a194beb2c01999e08010b44c279cbaaeeadf86c Merge: a56b9501f 6c966b894 Author: teor Date: Wed Feb 27 09:37:50 2019 +1000 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug29145| 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit df70c44960aec3abc617b4d395bf5443c543cedc Merge: 506264791 fb309f6eb Author: Nick Mathewson Date: Thu Feb 21 13:23:22 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" to avoid version bump ___ tor-commits mailing

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 50626479183858d25d4e52b80b000dbb43097917 Merge: 508002a4c be84ed1a6 Author: Nick Mathewson Date: Thu Feb 21 10:08:14 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/ticket29168 | 5 + src/or/scheduler_kist.c | 2 +- 2 files changed, 6 insertions(+), 1

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 7614a8b612619affe2b216aab34556aea1b26fb4 Merge: db209d4db 41c2bf590 Author: Nick Mathewson Date: Thu Feb 21 09:49:56 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit db209d4dba2a3f55447bdd338b074ea36cf46b7d Merge: 8ea98c0f4 7ead2af62 Author: Nick Mathewson Date: Tue Feb 12 09:56:49 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/geoip-2019-02-05 | 4 + src/config/geoip | 22020

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 8ea98c0f4cac6d2d8a90104425d04db57e39ec1f Merge: 1c5f03fba 4d7a0a131 Author: Roger Dingledine Date: Tue Feb 5 08:09:47 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug29244| 4 src/rust/Cargo.lock | 2 ++ 2 files changed, 6 insertions(+) diff --cc

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 1c5f03fba7e0ccf3381cfeb609b5229f7911e359 Merge: 761f1bf71 d1c0dbabf Author: Nick Mathewson Date: Wed Jan 23 09:51:02 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 761f1bf71e301f0b68718854379dd42e06fcd202 Merge: 41bb77822 4cca7fb99 Author: Nick Mathewson Date: Fri Jan 18 12:25:08 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug29029 | 5 + src/or/rendmid.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 50a686e586c0208e7aa9c3ea4e0210ab73cc0b71 Merge: ea47563dd b5fdb91ad Author: Nick Mathewson Date: Mon Jan 7 21:16:56 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 "Ours" to avoid version bump. ___ tor-commits mailing

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit d8196dc200b9a21af53313999551c7c081a5c8f4 Merge: 3d18903f5 63eed6edf Author: Nick Mathewson Date: Mon Jan 7 10:22:13 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" merge to avoid version bump. ___ tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 3d18903f53081cc31bd74d10632d1319ed5eba48 Merge: d7259b64d ba71b1786 Author: Nick Mathewson Date: Mon Jan 7 08:43:45 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit d7259b64d41a29781b3150badccec093a7a0ef30 Merge: fe3331b84 fee2eaf2d Author: Nick Mathewson Date: Fri Jan 4 15:04:58 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit fe3331b84554c6d6e2e633d77de02453b9a73f88 Merge: d47c9276d bf8bb9c52 Author: Nick Mathewson Date: Fri Jan 4 14:57:06 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug28619| 6 ++ src/or/hs_service.c | 6 -- 2 files changed, 10 insertions(+), 2

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 3e64553f769a4d2536c9f0ac0ad289cf9c41826d Merge: 2420e84ba 1ea312718 Author: Nick Mathewson Date: Thu Jan 3 09:02:39 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/ticket28973| 6 ++ src/common/tortls.c| 46 +-

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 633813e313cc6e889790e2bf9875a842ba1d99b7 Merge: 6506b1ee9 93019b478 Author: Nick Mathewson Date: Tue Dec 11 10:00:22 2018 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/ticket24803 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 6506b1ee9f7d7daf31832c496ae9e30949fec995 Merge: c4f7953d8 c1f919158 Author: Nick Mathewson Date: Tue Dec 11 09:41:05 2018 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/ticket24803 | 5 + src/or/fallback_dirs.inc | 581

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit c4f7953d8b869f9b7637428d5fc859fb62f302ff Merge: e3a19b1c7 00341d97f Author: Nick Mathewson Date: Thu Dec 6 09:26:32 2018 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit e3a19b1c788ba303a41cab0dcba945af84041764 Merge: 36c323553 ffc7b81b5 Author: Nick Mathewson Date: Sat Dec 1 11:15:09 2018 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug28554 | 3 +++ src/test/test_entrynodes.c | 5 - 2 files changed, 7 insertions(+), 1

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 15e752e6b111e159b1dee3bb4692d8de3c4d1c7f Merge: 63312e029 cbe04d455 Author: Nick Mathewson Date: Thu Nov 15 16:54:56 2018 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug24104| 4 ++ src/or/rephist.c| 7 ++- src/or/rephist.h|

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 63312e0299090bb61de62cd5ed45166a70b7f698 Merge: 1e6ffeaea aebe8a82c Author: Nick Mathewson Date: Thu Nov 15 16:47:25 2018 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/ticket26913 | 7 +++ doc/tor.1.txt | 6 -- src/or/config.c | 21

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 1e6ffeaeaaf3c01a85c69e9cee76f124720bb8c8 Merge: 27b917047 34e4d5a78 Author: Nick Mathewson Date: Thu Nov 15 16:37:41 2018 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/ticket27550| 5 + src/or/directory.c | 2 +- src/or/hs_client.c | 4

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 1043532a5155cdd2667808e8db2e5de5c486ed8b Merge: 42be1c668 db3acb3aa Author: Nick Mathewson Date: Wed Nov 14 07:55:07 2018 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug28419 | 3 +++ src/tools/tor_runner.c | 3 ++- 2 files changed, 5 insertions(+), 1

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 42be1c668b9f8ec255afb307054e6388f478e837 Merge: 1fce9d129 54d1a2d80 Author: Nick Mathewson Date: Tue Nov 13 08:27:29 2018 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug28413 | 4 src/common/aes.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 1fce9d129604ea25db4a697218e961c0dadf0133 Merge: 6b2ff4fff 93b6d4137 Author: Nick Mathewson Date: Sun Nov 11 18:05:45 2018 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 src/common/tortls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 6b2ff4fff8d33acd44cacf8e4907a6382c40e216 Merge: 591a189fa d0c3723c3 Author: Nick Mathewson Date: Sun Nov 11 11:57:53 2018 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/geoip-2018-11-06 | 4 + src/config/geoip | 22164

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 591a189fa42c87d706b4395ac6e70110f88b4fe9 Merge: 5acf6f871 c06b7f090 Author: Nick Mathewson Date: Fri Nov 9 10:49:47 2018 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug28245| 6 ++ configure.ac| 1 + src/common/tortls.c | 17 + 3

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit bfe8f50cc80acaf17ded5f2a01fdd8ced0db6ace Merge: f288f2478 6bd069630 Author: Nick Mathewson Date: Fri Nov 2 09:06:37 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26470 | 4 src/or/connection_edge.c | 5 - 2 files changed, 8 insertions(+), 1

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 8ed4f1ee8418eaafcb6314f093d1186d711a837e Merge: 158db532e e847909b7 Author: Nick Mathewson Date: Fri Nov 2 09:04:25 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/ticket27410 | 5 + src/or/hs_client.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 158db532eb6423a87434599ff0a0c5fb46208e69 Merge: cf2cb783b bcc1a7180 Author: Nick Mathewson Date: Wed Oct 31 11:01:41 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27948| 6 ++ src/test/bt_test.py | 10 ++ 2 files changed, 12 insertions(+), 4

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit cf2cb783b77bf9a84c6485b492ebb7e09914b74f Merge: c4b6b5738 038bc21f8 Author: Nick Mathewson Date: Tue Oct 30 09:34:04 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27741 | 5 + src/rust/protover/ffi.rs | 13 - 2 files changed, 9

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit c4b6b573880ba3f4806fed09e20ff384b556e277 Merge: b063ca060 8013e3e8b Author: Nick Mathewson Date: Mon Oct 29 15:57:31 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug28202 | 4 src/or/parsecommon.c | 3 +-- src/or/routerparse.c | 7 +++ 3 files

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit fd6078b33a0a174a060a2ae90e9455e6f0ee6fe9 Merge: 7edc594ee b2c52f5d6 Author: Nick Mathewson Date: Tue Oct 23 19:50:53 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 src/rust/protover/ffi.rs | 1 - 1 file changed, 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 7edc594ee732960733d34309980d0e7190e35fb2 Merge: d1eac7830 169bc670d Author: Nick Mathewson Date: Tue Oct 23 19:18:23 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27740 | 4 changes/bug27804 | 3 +++ src/rust/protover/ffi.rs | 10

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit d1eac7830fbd86d145c1892b8a7123615cc34658 Merge: 2000d04cb 93fd924bd Author: Nick Mathewson Date: Thu Oct 18 09:12:58 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27800 | 4 src/or/nodelist.c| 37 +

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 633e99575ff5576ea01cc03c085b22776972bcc3 Merge: d1ec7bb06 6b2ef2c55 Author: Nick Mathewson Date: Mon Oct 15 12:52:54 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 src/or/hs_intropoint.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit d1ec7bb06e41d6f4b79c5709c6d7be62393939e7 Merge: 3462f8ed6 86e0be421 Author: Nick Mathewson Date: Mon Oct 15 12:47:46 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 src/common/util_bug.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 3462f8ed6430bdb1528a7b63aaf2281489eb04d1 Merge: fd528a088 796e36e53 Author: Nick Mathewson Date: Mon Oct 15 10:48:35 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 src/common/util_bug.h | 7 ++- src/or/hs_common.c| 7 +++ 2 files changed, 9 insertions(+), 5

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit fd528a0884e706f5ad10422d0c4501ce35254530 Merge: ffaf180b7 dff7d3d00 Author: Nick Mathewson Date: Mon Oct 15 10:37:52 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27709 | 4 src/common/util_bug.h | 57

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit ffaf180b7e11897efaf874ec2ddcc72a8a2e67e5 Merge: 484b25960 f7e93cf2e Author: Nick Mathewson Date: Wed Oct 10 17:12:34 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit e5fe8b0e3aff7b2c40df92414c57626a36f4500c Merge: f57d8722e b057623be Author: Nick Mathewson Date: Wed Oct 10 11:34:49 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/geoip-2018-10-09 | 4 + src/config/geoip | 38518

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit e818a7190599ff46184e1b8541b2317c145e6d8d Merge: 163230e24 2cadd93ce Author: Nick Mathewson Date: Fri Sep 21 09:35:54 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27316 | 3 +++ src/or/protover.c| 17 - src/test/test_protover.c

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 2ddbaf9cdc3c850a56ef1f3bf6977c903e24bb39 Merge: 6f47734ea 75b95e1c8 Author: Nick Mathewson Date: Tue Sep 18 08:31:14 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27206| 4 +++ src/rust/protover/protoset.rs | 49

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 6f47734ea8dde2d05160644dfcfcd34ee1a63505 Merge: 8f689e0eb a546e0760 Author: Nick Mathewson Date: Fri Sep 14 12:56:30 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27335| 4 src/or/hs_service.c | 6 +++--- 2 files changed, 7 insertions(+), 3

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 8f689e0eb2b9c7bd51e4ddfe5e9f57d72fb45385 Merge: 82b128277 281854bab Author: Nick Mathewson Date: Fri Sep 14 10:48:01 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27708 | 4 src/or/config.c | 1 + 2 files changed, 5 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 82b128277203b86f35739a424787bbb268a6cdeb Merge: 3ddfd5ff2 7c26f88fd Author: Nick Mathewson Date: Fri Sep 14 09:25:34 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27687 | 4 src/rust/protover/errors.rs | 3 +++

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 3ddfd5ff25b1319dee3a013c8dac02ff9121971e Merge: f8d5fb42a 825342825 Author: Nick Mathewson Date: Thu Sep 13 11:46:04 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27658 | 6 ++ src/ext/tinytest.c | 12 ++-- 2 files changed, 16 insertions(+), 2

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit f8d5fb42a392a764da9f46102583ea2dff960939 Merge: 73ba308d3 4fa46fca8 Author: Nick Mathewson Date: Wed Sep 12 17:24:41 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27649| 4 src/rust/protover/protoset.rs | 17 -

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit affbe376f9a15c7c839287b8127d3bd9ac2eab02 Merge: 89c5b8d7d ae1aea4cc Author: Nick Mathewson Date: Tue Sep 11 15:53:06 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug25505| 3 +++ src/or/channelpadding.c | 9 +++-- 2 files changed, 10 insertions(+), 2

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 89c5b8d7dc4b22a3c91241a6e91edc41c2c6b362 Merge: 46bccc50e 1d8957129 Author: Nick Mathewson Date: Tue Sep 11 13:09:21 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 8a873a5695ec07c9c052ef87bd42fb00f9bf672d Merge: 96601a680 8afc100cb Author: Nick Mathewson Date: Tue Sep 11 12:04:56 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/geoip-2018-09-06 | 4 + src/config/geoip | 49324

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 7a343ecec55b47f5ff6dcf5ee61ad6d3e1796475 Merge: 0d5aaef46 05f5f6500 Author: Nick Mathewson Date: Mon Sep 10 09:42:22 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" to avoid version bump. ___ tor-commits mailing

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 0d5aaef465f782d46f538b03fd962ba7007fca11 Merge: fa38bbb70 cff7cb858 Author: Nick Mathewson Date: Fri Sep 7 15:12:27 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" to avoid bump. ___ tor-commits mailing list

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 8849b2ca3c3943e7d2f109b8e56179be82092a6e Merge: 967cef2f8 732ea9120 Author: Nick Mathewson Date: Fri Sep 7 09:15:56 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27344| 4 configure.ac| 1 + src/common/tortls.c | 7 ++- 3 files changed, 11

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit a78504dbe62efac4a8f0ce03f3fb1123bde7c1dd Merge: a4930de5e 056003d60 Author: Nick Mathewson Date: Fri Sep 7 08:46:45 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27461 | 5 + src/or/main.c| 8 2 files changed, 13 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit a4930de5e96b83295478386cd15c8a7a3e8c0ef8 Merge: b6de39e5f df18cf0e8 Author: Nick Mathewson Date: Fri Sep 7 08:44:40 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27463| 3 +++ src/or/rendclient.c | 9 + 2 files changed, 12 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit b6de39e5f465259b78d3886e0231d3dfef58fc1f Merge: 2b0416366 08d5fd39d Author: Nick Mathewson Date: Fri Sep 7 08:42:19 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27465 | 5 + src/common/address.c | 5 - 2 files changed, 9 insertions(+), 1

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 2b04163666ae22b4df81b868374bbd449614cc2b Merge: b390983b2 a7e72f0c4 Author: Nick Mathewson Date: Wed Sep 5 10:16:06 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 .travis.yml | 2 +- changes/bug27418 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --cc

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 4ab033c3bc94950ffe442c5f7b5a87f3f3382996 Merge: 0ea622aa3 67bdd144b Author: Nick Mathewson Date: Wed Sep 5 09:56:19 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 .travis.yml | 6 +++--- changes/bug27453 | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 0ea622aa3a678f19759a42e9521a259ef4bcf5a4 Merge: 0483f7f64 a28c14aad Author: Nick Mathewson Date: Wed Aug 29 11:17:31 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 Makefile.am | 3 ++- changes/bug27295 | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 0483f7f64c80fe18c922415ae6062149a2ebb9f7 Merge: 4c1c818ff 64c3c6a79 Author: Nick Mathewson Date: Mon Aug 27 09:39:08 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27345| 5 + src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 658171318f67dd83ee115044cbf103325951a174 Merge: dd27e17cc 33e4e30d0 Author: Nick Mathewson Date: Fri Aug 24 12:33:20 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/27286| 4 src/or/dirauth/dirvote.c | 8 2 files changed, 8 insertions(+), 4

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 6e0872e8672ed18f8c250cdcbdfd3d7bf047c076 Merge: ced350882 e01ea64f0 Author: Nick Mathewson Date: Thu Aug 23 19:36:45 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27185 | 3 +++ src/test/test.c | 10 ++ 2 files changed, 5 insertions(+), 8 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 573b6e4f2f532b77341e5307e23f3c6bf6bdc725 Merge: 81e529d23 8691046ac Author: Nick Mathewson Date: Wed Aug 22 09:37:31 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 src/or/connection_edge.c | 1 - 1 file changed, 1 deletion(-) diff --cc src/or/connection_edge.c index

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 81e529d236f41607b133c5562e2d5887fcfd5b8a Merge: aac1e17f2 3cfceeb45 Author: Nick Mathewson Date: Tue Aug 21 20:04:17 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit f68aab83ba6ab61b010d4445b6c68a6cf780471a Merge: df874ed0f 245025a3d Author: Nick Mathewson Date: Tue Aug 21 19:20:31 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27226 | 5 ++ src/common/tortls.c| 10 ++-- src/test/test_tortls.c | 122

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit df874ed0f198156ca59bdca24259b229dbd55102 Merge: 700f5bcc4 4c0c4d4ad Author: Nick Mathewson Date: Tue Aug 21 10:01:41 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26873 | 4 1 file changed, 4 insertions(+) ___

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 700f5bcc43fb959927dd1cae4e2943d115144850 Merge: ac721bd3b 87aacbfbb Author: Nick Mathewson Date: Fri Aug 17 09:38:26 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27177 | 4 src/rust/protover/protoset.rs | 15 ++- 2 files changed,

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit ac721bd3b4223586b004df5f8be1b05069bf6855 Merge: b49355915 cc93f175e Author: Nick Mathewson Date: Fri Aug 17 09:29:46 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27164 | 4 src/rust/protover/protoset.rs | 14 +- 2 files changed,

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit b49355915bf063448cf338fbb76061b601e5e333 Merge: 2deee972a 936e2aa0d Author: Nick Mathewson Date: Thu Aug 16 08:37:11 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26932| 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 2deee972a37a8b36040f0f37091906b8dec61b25 Merge: 571cb2f66 4847e2216 Author: Nick Mathewson Date: Thu Aug 16 08:35:31 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 doc/HACKING/GettingStartedRust.md | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 571cb2f662f1c39eb1069c12164a3dc202afb362 Merge: 6c1d2549d 0fc171a47 Author: Nick Mathewson Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 6c1d2549df546b6d2628582c9b078753eecd16f4 Merge: b4362b99c 1868982de Author: Nick Mathewson Date: Wed Aug 15 02:16:23 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26779| 4 configure.ac| 20

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit b4362b99cf1857f2fdf4390796bbf64ac9f204f3 Merge: 0f0dac0bf fde551a38 Author: Nick Mathewson Date: Thu Aug 9 08:47:25 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/geoip-2018-08-07 | 4 + src/config/geoip | 14291

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 0f0dac0bfcfc357a87c3d275e9846bdfca946877 Merge: aaa5ca366 c4d0d9bd2 Author: Nick Mathewson Date: Wed Aug 8 18:06:15 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26948 | 4 src/or/main.c| 9 + 2 files changed, 9 insertions(+), 4 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit aaa5ca366e83795f3ec7b35e879a3c8bc4e0b41f Merge: de129e69b 00536254b Author: Nick Mathewson Date: Wed Aug 8 09:26:23 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug25440 | 5 + src/common/sandbox.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit be8e56c231755069fae03eb13a4ddd9fba4f6563 Merge: 861d69001 2a6c1585b Author: Nick Mathewson Date: Fri Aug 3 07:33:45 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug20424_029_minimal | 4 configure.ac | 4 2 files changed, 8 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 861d690018c213ad017fbf8dc99d4790c111c396 Merge: bcce3e7e0 eb604f5fa Author: Nick Mathewson Date: Wed Aug 1 14:37:07 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 src/test/test_config.c | 31 ++- 1 file changed, 18 insertions(+), 13 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit bcce3e7e0b53b0d800337c53b855713bfb83c37e Merge: 21babc8d3 373b23a9e Author: Nick Mathewson Date: Tue Jul 31 08:30:01 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26876 | 4 configure.ac | 32 +--- 2 files changed, 33

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 21babc8d3f138be94336cad40168390ed9509793 Merge: 7d66ec0fe 4f854dbdc Author: Nick Mathewson Date: Mon Jul 30 09:01:59 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26627 | 7 +++ src/or/hs_circuit.c | 20 ++--

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 7d66ec0feba7aa7cfbaeb8c3af2df35cdcd536f1 Merge: d102e9c2e a159eaf45 Author: Nick Mathewson Date: Mon Jul 30 08:45:01 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26924 | 4 changes/bug26927 | 4 src/or/connection_or.c | 14

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit d102e9c2e4ab5dfca0c03f7b4e27431d069338fd Merge: 977821e59 15d7f24c5 Author: Nick Mathewson Date: Mon Jul 30 08:17:25 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26785 | 4 configure.ac | 3 +++ src/common/compress_zstd.c | 4

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 977821e59fb6e57639a842f498be32633bb0b0e1 Merge: 7260d07fe dbf57ecf3 Author: Nick Mathewson Date: Fri Jul 20 10:42:29 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/ticket26647 | 4 src/or/control.c| 4 2 files changed, 8 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 27f5bd52fea3a18daadc455e9e044e997753c93d Merge: d5dd500e3 0a60a94a5 Author: Nick Mathewson Date: Thu Jul 19 08:31:07 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26853| 3 +++ src/test/test_key_expiration.sh | 8 2 files changed, 11

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit d5dd500e36093499984e58882b07d2b9a5628235 Merge: 39d3187b0 e0f99404f Author: Nick Mathewson Date: Wed Jul 18 16:39:25 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26787 | 3 +++ 1 file changed, 3 insertions(+) ___

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 39d3187b0d4997cb4b88fbf15be0b3260ac2ca3a Merge: a7bd20eba 9e247ac27 Author: Nick Mathewson Date: Wed Jul 18 16:39:10 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 src/test/test_bt.sh | 2 ++ 1 file changed, 2 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit a7bd20ebaf384111781277fcee66a7b0bb238f6d Merge: 304ee896d c31700d66 Author: Nick Mathewson Date: Wed Jul 18 15:08:57 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26485 | 4 src/or/config.c | 9 +++- src/or/dirauth/dirvote.c | 50

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 304ee896d16dcc058a92998133ee77be24bfa735 Merge: 864564725 28d1057d5 Author: Nick Mathewson Date: Tue Jul 17 14:56:52 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26830| 3 +++ src/test/test_keygen.sh | 8 2 files changed, 11 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit e0f33c1d3e7b87fcea26b8ba2ffb9d292449d9d8 Merge: d7ad6d924 710188f84 Author: Nick Mathewson Date: Thu Jul 12 14:32:16 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/task26771| 4 src/or/auth_dirs.inc | 4 ++-- 2 files changed, 6 insertions(+), 2

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit d7ad6d924ed12f54e2b61d2013046389673cd8ae Merge: 5ce348c4c f5e3bcb60 Author: Nick Mathewson Date: Mon Jul 9 15:17:48 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" to avoid version bump. ___ tor-commits mailing

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 98dff5df3fd22be0a7a084dace22b218243e5164 Merge: 529faef28 250e0fc1c Author: Nick Mathewson Date: Mon Jul 9 10:17:20 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 src/test/test_entrynodes.c | 6 ++ 1 file changed, 6 insertions(+) diff --cc src/test/test_entrynodes.c

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 529faef28eb3e8907cfb814516953d6636f50487 Merge: afee78541 69918629f Author: Nick Mathewson Date: Mon Jul 9 10:15:16 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26269 | 5 + src/or/router.c | 17 ++--- 2 files changed, 15 insertions(+), 7

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit afee785417cba083c4914fd9b6db49498c2eb241 Merge: 9320100d6 532873a92 Author: Nick Mathewson Date: Mon Jul 9 09:24:14 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" merge to avoid version bump ___ tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit b74ed31f90ec43a7666cf622a6547d6d670e1692 Merge: 75d9db9e5 a95cfb8a5 Author: Nick Mathewson Date: Mon Jul 9 09:21:46 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" merge to avoid cherry-picked copy of #25512 fix, which is already in this branch.

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 75d9db9e5b6d700029ff8ac362fa0ea5c80fbd80 Merge: 1af69c181 f721a0822 Author: Nick Mathewson Date: Mon Jul 9 09:14:37 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --cc src/test/test_rust.sh

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 1af69c1812e561e99f8cb859bec21edcc8dbcd74 Merge: 9b9625bdf 451a84cec Author: Nick Mathewson Date: Mon Jul 9 09:11:41 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/geoip-2018-07-03 |4 + src/config/geoip | 7171

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 9b9625bdfa0b69485ba9e34c57879abc15b71458 Merge: 32d9d6935 fead22fb2 Author: Nick Mathewson Date: Mon Jul 9 09:09:01 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

  1   2   >