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

commit e5deb2bbc73d8830ae6c479a4532e72112f5484a Merge: 6945f2b3e a521c4278 Author: Nick Mathewson Date: Fri May 17 08:10:16 2019 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/geoip-2019-05-13 | 4 + src/config/geoip | 15407

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

commit 3b9e3cca94dbeb083bfd64dfd4eb22a905cd2748 Merge: 316aed502 48e990359 Author: teor Date: Sat Apr 6 09:33:20 2019 +1000 Merge branch 'maint-0.3.4' into maint-0.3.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https

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

commit 4aa02d3c7abe84e99874f6bf7bfffb7b551935a5 Merge: 0418d4081 3cfcfbac4 Author: Nick Mathewson Date: Wed Apr 3 09:27:43 2019 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/geoip-2019-04-02 | 4 + src/config/geoip | 10355

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

commit 0418d4081acd2708a16dd757af4aac4777658da9 Merge: 3280e9a11 74775b2df Author: teor Date: Tue Apr 2 11:45:22 2019 +1000 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/bug29703 | 4 1 file changed, 4 insertions(+) ___ tor-commits

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

commit 3280e9a116df6202dba4e3ee50a9c9d2a1f6699d Merge: 091f8688b 6d057c56f Author: teor Date: Wed Mar 27 10:02:40 2019 +1000 Merge branch 'maint-0.3.4' into maint-0.3.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https

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

commit 41cd05562f68c23f8c3d95472e20a86165f6dc20 Merge: 6bf9078ce d7a5fdcb7 Author: teor Date: Wed Mar 20 09:48:03 2019 +1000 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/bug29706_minimal | 4 src/feature/dirauth/shared_random_state.c | 4 ++--

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

commit 5d41e2223f64517300aad168b2f2479ba00ac10b Merge: ffd720702 e021f89f3 Author: teor Date: Thu Mar 14 06:59:09 2019 +1000 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" merge to ignore the changes to src/common/compat.c, they have already been merged to 0.3.5 in the

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

commit d6f77b99dac1a368514cfcfc1d6c5908ef6dd74a Merge: 1c248fa27 155b0f552 Author: Nick Mathewson Date: Wed Mar 6 14:29:38 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/geoip-2019-03-04 | 4 + src/config/geoip | 12163

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

commit 1c248fa27d978a3a20f29ea76cc23c4c4604d1a0 Merge: de0969ef7 f56645917 Author: teor Date: Fri Mar 1 14:16:59 2019 +1000 Merge branch 'maint-0.3.4' into maint-0.3.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https

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

commit de0969ef7816d54acdcc9f1e2960d8bbc4400ecf Merge: be29dfedd 6a61a020e Author: teor Date: Thu Feb 28 10:49:33 2019 +1000 Merge branch 'maint-0.3.4' into maint-0.3.5 src/test/test_shared_random.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

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

commit be29dfedd99f49b8bf22422eff04986f12580733 Merge: 15dc33849 524731503 Author: teor Date: Thu Feb 28 10:45:59 2019 +1000 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/bug29599 | 3 +++ src/test/test_shared_random.c | 5 +++-- 2 files changed, 6 insertions(+), 2

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

commit 15dc33849eda4fba651bf4096a9e405d737a977b Merge: 1216f9953 1a194beb2 Author: teor Date: Wed Feb 27 09:38:04 2019 +1000 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/bug29145| 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

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

commit e1079266e73c70cc0e5141249ebf3199a849017d Merge: 4a8a1f76e a56b9501f Author: Nick Mathewson Date: Thu Feb 21 13:23:52 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" to avoid version bump. ___ tor-commits mailing

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

commit 4a8a1f76ea6cbde128f2cda49049866ea739931d Merge: c663716b6 506264791 Author: Nick Mathewson Date: Thu Feb 21 10:08:14 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/ticket29168 | 5 + src/core/or/scheduler_kist.c | 2 +- 2 files changed, 6

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

commit 46910c060f6d0065f1745500e2bef89da8f8801a Merge: d83c299eb 508002a4c Author: Nick Mathewson Date: Thu Feb 21 09:50:46 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" to avoid version bump. ___ tor-commits mailing

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

commit 2e770216c498d7e714d1dbd78ab8790e137959f1 Merge: 46b6df712 db209d4db Author: Nick Mathewson Date: Tue Feb 12 09:56:49 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/geoip-2019-02-05 | 4 + src/config/geoip | 22020

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

commit bca25eebfbc9e80665d63bbe02ba5ce21081eab1 Merge: 712a622fc 8ea98c0f4 Author: Roger Dingledine Date: Tue Feb 5 08:10:14 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/bug29244| 4 src/rust/Cargo.lock | 2 ++ 2 files changed, 6 insertions(+)

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

commit f9050681c032bd339bdf6314c9ee8e577d37cedc Merge: d9fde8760 1c5f03fba Author: Nick Mathewson Date: Wed Jan 23 09:51:02 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit a8580a683696eb76f5f24fe36e7ea61f9c49db0a Merge: f0408b844 761f1bf71 Author: Nick Mathewson Date: Fri Jan 18 12:25:08 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/bug29029 | 5 + src/feature/rend/rendmid.c | 6 +++--- 2 files changed, 8

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

commit 971f4bf13944864156684b3d3be8df53fb9d0686 Merge: 52b508735 41bb77822 Author: Nick Mathewson Date: Mon Jan 7 21:17:46 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" to avoid version bump ___ tor-commits mailing

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

commit d51595ec573df21cc96ee71fbb466d6a4e30ae1c Merge: 85c5f5850 ea47563dd Author: Nick Mathewson Date: Mon Jan 7 10:22:47 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" to avoid version bump. ___ tor-commits mailing

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

commit 85c5f58509898bf8236ccb8998556f1ab688cb05 Merge: 74bda3079 3d18903f5 Author: Nick Mathewson Date: Mon Jan 7 08:43:46 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599

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

commit 74bda3079c97490e0cdae7368ef1bc6f1242bd47 Merge: 16deb1f5f d7259b64d Author: Nick Mathewson Date: Fri Jan 4 15:04:58 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https

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

commit 16deb1f5f2112bf19e5a8387cb4ebe7b04b5b360 Merge: fa05efdf8 fe3331b84 Author: Nick Mathewson Date: Fri Jan 4 14:57:06 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https

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

commit fa05efdf8bbc0bff85d68e4634fc72a200984ed7 Merge: c75cf802d d47c9276d Author: Nick Mathewson Date: Fri Jan 4 14:36:02 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https

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

commit a9eec3364919a8e555631ef1654a016f1f00d59c Merge: 97c9ced70 2420e84ba Author: Nick Mathewson Date: Fri Dec 21 15:42:57 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/ticket28912 | 6 ++ src/core/mainloop/mainloop.c | 17 ++--- 2 files

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

commit b2625b09f1e455d9a2a3704ae50d968276d170ac Merge: e1273d7d1 633813e31 Author: Nick Mathewson Date: Tue Dec 11 10:00:22 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/ticket24803 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

commit e1273d7d1ba5cced68b0b035176ee20fc3367681 Merge: c1f86f749 6506b1ee9 Author: Nick Mathewson Date: Tue Dec 11 09:41:05 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/ticket24803 | 5 + src/app/config/fallback_dirs.inc | 581

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

commit c1f86f74927d9233305b4ef93adebf52dadd0147 Merge: 967efc0d2 c4f7953d8 Author: Nick Mathewson Date: Thu Dec 6 09:26:33 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100

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

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

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

commit 72c1303cef629576cb8d078590ed71091828fd78 Merge: feb41b7c3 36c323553 Author: Nick Mathewson Date: Tue Nov 27 12:03:50 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 .appveyor.yml | 4 ++-- changes/ticket28574 | 4 2 files changed, 6 insertions(+), 2 deletions(-)

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

commit a9820f072bf1bd796651e9e3913988e6224bd524 Merge: 0489288aa 9da8cd0bc Author: Nick Mathewson Date: Tue Nov 20 13:10:38 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 .appveyor.yml | 4 +++- changes/ticket28459 | 4 2 files changed, 7 insertions(+), 1 deletion(-)

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

commit 1b4075cb272a6f9a14cd0e0b8c73d359666fc479 Merge: 8af8ecabb fe1fb4b0c Author: Nick Mathewson Date: Thu Nov 15 17:08:04 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" merge to avoid taking 25573 and 27686 again. ___

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

commit 8af8ecabbe429503a4ff9d5510df610907c6e45a Merge: c0e18d2f8 15e752e6b Author: Nick Mathewson Date: Thu Nov 15 16:55:42 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" merge to avoid duplicating conflict resolution in merge of 24104

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

commit c0e18d2f899b32c2c25429e7991e28d5c59ee4ef Merge: a88ce61b3 63312e029 Author: Nick Mathewson Date: Thu Nov 15 16:47:25 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit a88ce61b351412a9a62c8e2340773b5b682f1b17 Merge: 4b6b58ed8 1e6ffeaea Author: Nick Mathewson Date: Thu Nov 15 16:38:19 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" merge to avoid the 0.3.3 version of #27550. ___

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

commit a9db07f3253bb7db23c05fbe0e01ff424a5a45a1 Merge: d598d834f 27b917047 Author: Nick Mathewson Date: Thu Nov 15 09:06:18 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 .appveyor.yml| 21 + changes/bug28399 | 4 changes/bug28454 | 4 3 files

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

commit eba989bf0e7761713079e4f2af91c9ab9374a300 Merge: 763ccd092 1043532a5 Author: Nick Mathewson Date: Wed Nov 14 07:55:07 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/bug28419 | 3 +++ src/tools/tor_runner.c | 2 ++ 2 files changed, 5 insertions(+)

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

commit ae4c94bb6468078ba16de481991e781e1b486340 Merge: 896d0ebb9 42be1c668 Author: Nick Mathewson Date: Tue Nov 13 08:27:29 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/bug28413| 4 src/lib/crypt_ops/aes_openssl.c | 4 ++-- 2 files changed, 6

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

commit 896d0ebb994cc0b1df2c9497fcf3afe55654d01f Merge: 76ed869ff 1fce9d129 Author: Nick Mathewson Date: Sun Nov 11 18:05:45 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 src/lib/tls/tortls_openssl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --cc

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

commit 76ed869ff9b1e0b33b31ec22c6fd2957edb1ae45 Merge: 2ac2d0a42 6b2ff4fff Author: Nick Mathewson Date: Sun Nov 11 11:57:53 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/geoip-2018-11-06 | 4 + src/config/geoip | 22164

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

commit 2ac2d0a426d1cd0ba1b2004d349b28e7acda0666 Merge: 8db047b92 591a189fa Author: Nick Mathewson Date: Fri Nov 9 10:49:47 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/bug28245 | 6 ++ configure.ac | 1 + src/lib/tls/tortls_openssl.c |

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

commit 0ea508ec6f540f0c768d993df257a9733fac4074 Merge: 3c691613c 5acf6f871 Author: Nick Mathewson Date: Fri Nov 2 13:01:53 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" merge to avoid version bump. ___ tor-commits

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

commit ff05162710cb514b3c0c054b034dc9c2bd66e97d Merge: bbdf56aed d8d4fe83d Author: Nick Mathewson Date: Fri Nov 2 09:08:53 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" to avoid version bump. ___ tor-commits mailing list

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

commit bbdf56aed625b67a8675ad3441afe76198a8a8bc Merge: a3fc93b8d bfe8f50cc Author: Nick Mathewson Date: Fri Nov 2 09:06:38 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https

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

commit d409565e38d44c6f2fb08b4b2d37c76597e3d951 Merge: 0d124488f 8ed4f1ee8 Author: Nick Mathewson Date: Fri Nov 2 09:04:25 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit a3fc93b8dd8558b741a5d2e3d322957fa9396875 Merge: d409565e3 f288f2478 Author: Nick Mathewson Date: Fri Nov 2 09:05:18 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https

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

commit 0d124488f8a472d41528ffe0f0ed0e9437f31a16 Merge: 488969fe9 158db532e Author: Nick Mathewson Date: Wed Oct 31 11:02:58 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/bug27948| 6 ++ src/test/bt_test.py | 10 ++ 2 files changed, 12 insertions(+), 4

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

commit 3a05b5acdc4a40eae6016ab94067bf5dde92e5fe Merge: 97324a731 cf2cb783b Author: Nick Mathewson Date: Tue Oct 30 09:35:11 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 9d75f7984641e0bff230bf22eb5d5b29383236d6 Merge: e9ff3e7d4 c4b6b5738 Author: Nick Mathewson Date: Mon Oct 29 15:57:31 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit c78904b6302c53e0778854974c13aa4d5a499bb0 Merge: 6851a0809 b063ca060 Author: Nick Mathewson Date: Wed Oct 24 12:57:14 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" to avoid taking a second instance of 27797. ___

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

commit 131ab9d5233a2f452c608bf85a39255903d036c1 Merge: 289a7dbac fd6078b33 Author: Nick Mathewson Date: Tue Oct 23 19:54:04 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" version to avoid removing rust use declaration.

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

commit 289a7dbac32a981897e12a3c250f0b6c67eec809 Merge: 1ae911660 7edc594ee Author: Nick Mathewson Date: Tue Oct 23 19:21:44 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/bug27740 | 4 changes/bug27804 | 3 +++ src/rust/protover/ffi.rs | 3 +++

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

commit a5599fb71c51ddec47282164f71cfb06933096cc Merge: 7f6c0fce4 d1eac7830 Author: Nick Mathewson Date: Thu Oct 18 09:12:58 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 ___ tor-commits mailing list tor-commits@lists.torproject.org