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
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
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(-)
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
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(-)
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
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
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
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
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
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
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(-)
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
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
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
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
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
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 +-
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(-)
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
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
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
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|
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
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
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
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(-)
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(-)
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
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
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
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(-)
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
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
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
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(-)
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
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 +
38 matches
Mail list logo
