commit b39c50cde8b1d7e3e27d5a6fc2e58ff208982637
Merge: 1cf11b694 a2aaf9509
Author: Nick Mathewson
Date: Fri Jan 19 16:29:43 2018 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
Conflicts:
src/or/rendservice.c
changes/bug24895 | 8
src/or/rendservice.c
commit 1cf11b69408ab3707de01711308a05e223a767f5
Merge: b85fa0bd5 36567c5ca
Author: Nick Mathewson
Date: Fri Jan 19 10:17:05 2018 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
.travis.yml | 24 +---
1 file changed, 21 insertions(+), 3 deletions(-)
___
commit b85fa0bd5fc95f831cfd416b3ec5bbdd7bc846a7
Merge: 8042c356f 9464da210
Author: Nick Mathewson
Date: Mon Jan 8 11:10:36 2018 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/ticket_24801 | 5 +
src/or/fallback_dirs.inc | 968 ++
commit 8042c356f4904107b0357d95d19f2c72f1d13cb5
Merge: 16fd975a8 26e28829d
Author: Nick Mathewson
Date: Mon Jan 8 09:34:56 2018 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/geoip-2018-01-05 | 4 +
src/config/geoip | 31441 ++
commit 16fd975a82e502418578c81f04894272c4f11826
Merge: bbc9ff160 c52d4d9e3
Author: Nick Mathewson
Date: Fri Jan 5 16:41:34 2018 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/ticket24681 | 6 ++
doc/tor.1.txt | 3 ++-
src/or/config.c | 9 -
3 files changed
commit bbc9ff160e7071b7a2fa9ab200b6496580975b06
Merge: 8a7767603 c9b3f6352
Author: Nick Mathewson
Date: Wed Jan 3 08:59:59 2018 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug24633 | 5 +
src/ext/timeouts/timeout-bitops.c | 4 ++--
2 files changed, 7 ins
commit 8a7767603a9ac826f39505fc9ea8c08385f6dfd6
Merge: 03b4dd92a 6e5e4f92a
Author: Nick Mathewson
Date: Tue Jan 2 10:10:28 2018 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug24736 | 6 ++
src/or/policies.c | 2 ++
2 files changed, 8 insertions(+)
__
commit 03b4dd92a4c359fb2f699c579ed6dbcd73981267
Merge: 08ed0d793 79a50afa0
Author: Nick Mathewson
Date: Thu Dec 21 10:49:40 2017 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug24666 | 7
src/or/circuitmux.c| 34 ++--
src/or/circuitmux.
commit 08ed0d79308b308f690b80d65b22be11a97caf09
Merge: d3b7a2bd2 c604a76a5
Author: Nick Mathewson
Date: Wed Dec 20 12:15:24 2017 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/geoip-2017-12-06 | 4 +
src/config/geoip | 12380 +++--
commit da38904efbdd0c2c6b754aed7f75201e3c1cd97a
Merge: 2ea573ece eecfed0cd
Author: Nick Mathewson
Date: Mon Dec 11 16:56:31 2017 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug24167| 7 +++
src/or/connection.c | 4
2 files changed, 11 insertions(+)
_
commit 2ea573ece8f168749b40eddcd023b71bf05a4fef
Merge: 7fcb222ab eaaa1108a
Author: Nick Mathewson
Date: Mon Dec 11 16:54:14 2017 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/ticket23856 | 4
src/or/rephist.c| 4 ++--
src/or/router.c | 2 +-
3 files changed, 7 ins
commit 7fcb222ab7c4cbd48ce2481f55110a8e2e0467f9
Merge: c55a05423 7e486dd6f
Author: Nick Mathewson
Date: Mon Dec 11 16:51:58 2017 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug23985| 9 +
src/or/routerlist.c | 5 +
2 files changed, 14 insertions(+)
__
commit 3bca705c544bd56ade5a25022b51d395f038444f
Merge: 6e3ec8222 953a8f851
Author: Nick Mathewson
Date: Fri Dec 1 12:13:40 2017 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug24480 | 3 +++
src/or/rendservice.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
commit 6e3ec8222c6b2b3eec332ef3b5d3b0eac0c00ce5
Merge: 1983068ba 495db72c1
Author: Nick Mathewson
Date: Fri Dec 1 09:35:16 2017 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
"ours" merge to avoid version bump.
___
tor-commits mail
commit 5fc0587c040339357bc3fc37f1b5474f1c3d1a33
Merge: d459c08b7 7e2b012b4
Author: Nick Mathewson
Date: Thu Nov 30 12:07:59 2017 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug24313 | 5 +
changes/trove-2017-009 | 10 ++
changes/trove-2017-010
commit 8f36104574a6dcce6e6dbb9b49e1f3766ab56441
Merge: 5fc0587c0 16c9cfd65
Author: Nick Mathewson
Date: Thu Nov 30 12:24:13 2017 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
___
tor-commits mailing list
tor-commits@lists.torproject.org
ht
commit 766d0a2d98591ed840cce42710c5a59a2e7dc731
Merge: b1c4ab0be 072e194a1
Author: Nick Mathewson
Date: Thu Nov 30 11:48:12 2017 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug21394 | 9 +
src/or/dns.c | 23 ---
2 files changed, 29 insertions
commit b1c4ab0bec5b2b07e7e5358f449e352bb34c75d0
Merge: 2d849716d 30b322925
Author: Nick Mathewson
Date: Mon Nov 27 09:09:34 2017 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bastet_v6 | 4
src/or/config.c | 1 +
2 files changed, 5 insertions(+)
commit 2d849716df357b570eaf4557638f63a9b2d8a6c1
Merge: 50fbede45 53c3174ee
Author: Nick Mathewson
Date: Sat Nov 18 11:02:08 2017 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug18329-minimal | 6 ++
src/or/router.c | 9 +
2 files changed, 15 insertions(+)
commit 50fbede4597d143411b3739e88d2c3d8ef457fbd
Merge: fea5c8a01 1b9bb2c84
Author: Nick Mathewson
Date: Mon Nov 13 20:36:04 2017 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/ticket22895 | 3 +++
src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 -
commit fea5c8a015548f54e3ef1d3de67e7a82f916c213
Merge: 16bdb9e36 543fd89fb
Author: Nick Mathewson
Date: Mon Nov 13 12:57:58 2017 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug23291| 3 +++
src/test/test-memwipe.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(
commit 16bdb9e365ff43885a4d3b3478ebb224f5a26a33
Merge: 9092e9019 ab415ae95
Author: Nick Mathewson
Date: Mon Nov 13 11:18:02 2017 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug23470 | 6 ++
src/or/directory.c | 22 +++---
2 files changed, 17 insertions
commit 9092e9019a111608b34dd6594d599d4ca464c36d
Merge: ece63105d 53758
Author: Nick Mathewson
Date: Mon Nov 13 11:15:50 2017 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug8185_025 | 6 ++
src/or/relay.c | 11 +++
2 files changed, 17 insertions(+)
_
commit ece63105d9157fa432cc59d8b828ca23a80040ff
Merge: 5348c8996 c928fb988
Author: Nick Mathewson
Date: Mon Nov 13 11:13:22 2017 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/ticket21953 | 6 ++
src/or/main.c | 10 +-
2 files changed, 15 insertions(+), 1 del
commit 5348c8996f53964ce7466f00acad33f625191983
Merge: f2e23d38a 9666c620d
Author: Nick Mathewson
Date: Sat Nov 11 12:23:33 2017 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/geoip-2017-11-06 |4 +
src/config/geoip | 9406 ---
commit f2e23d38ab109ea8d5be0d6b9e9edad4528ff68a
Merge: 6ce8cc5db 04d4786cc
Author: Nick Mathewson
Date: Tue Oct 31 11:43:14 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug23693 | 6 ++
src/or/config.c | 1 +
2 files changed, 7 insertions(+)
commit 6ce8cc5dbba52c2a5e60d4311e8b9cfe684f210e
Merge: 4edbbee2f 151d5eded
Author: Nick Mathewson
Date: Wed Oct 25 09:28:41 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
"ours" merge to avoid version bump
___
tor-commits mail
commit 302b5f577dc0840fd9f738d160ef14b88a71b67f
Merge: d913a7317 725f23710
Author: Nick Mathewson
Date: Tue Oct 24 09:10:24 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
"ours" merge to avoid version bump
___
tor-commits mail
commit 7bebd1b02551bb232fef73aa7f81c11ed6125a25
Merge: 5325e7cca 552b62028
Author: Nick Mathewson
Date: Tue Oct 24 09:11:24 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
"ours" merge to avoid version bump
___
tor-commits mail
commit 9ae4ffc0763fcb0a50d0d02be7d3362cc496adc1
Merge: eac4c374e b1bd1bf19
Author: Nick Mathewson
Date: Mon Oct 23 15:55:08 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug23874 | 3 +++
src/or/nodelist.c | 5 +
2 files changed, 8 insertions(+)
_
commit eac4c374e456af4f216392ec2d3b037d5f57e2f3
Merge: c93ecb818 fcd5c3144
Author: Nick Mathewson
Date: Mon Oct 23 09:11:10 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
src/test/test_config.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
_
commit c93ecb8189773e06fa3635fff8184024c6c6e0fa
Merge: 783e458c0 1db5081ba
Author: Nick Mathewson
Date: Mon Oct 23 09:06:34 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/ticket23910 | 3 +++
src/or/config.c | 3 +++
2 files changed, 6 insertions(+)
___
commit 783e458c07be5f3f3539b1420e2a51f8b4efe04a
Merge: 74e8fd22c c958fda6e
Author: Nick Mathewson
Date: Mon Oct 23 08:59:11 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/longclaw_23592 | 3 +++
src/or/config.c| 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
commit 74e8fd22c9971a7184d74d2775ca1c575e54e08f
Merge: 35574d4a9 132e2f69b
Author: Nick Mathewson
Date: Mon Oct 23 08:53:25 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug23690 | 5 +
src/or/circuitlist.c | 1 +
2 files changed, 6 insertions(+)
_
commit 35574d4a9ad1ce0fb40d3c06493276a71990ac48
Merge: d29e4c059 fcaf3335b
Author: Nick Mathewson
Date: Mon Oct 23 08:47:58 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug23081 | 8
src/or/ntmain.c | 1 +
2 files changed, 9 insertions(+)
___
commit d29e4c05973d9e371e800a8b0ed5f28fb8f1dc22
Merge: f7f55acae 68dea082e
Author: Nick Mathewson
Date: Mon Oct 23 08:46:29 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug22349 | 9 +
src/or/dirserv.c | 56 ---
commit f7f55acae96c391767fec94f8a1932b5d4645897
Merge: ad7db1077 43ebe54a2
Author: Nick Mathewson
Date: Thu Oct 5 11:04:59 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/geoip-october2017 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ad7db10770a396b1794364b9ec17dd4c17ee14dc
Merge: dc5c9af6c 2984d9916
Author: Nick Mathewson
Date: Thu Oct 5 11:03:35 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/geoip-october2017 |4 +
src/config/geoip | 8683 +++---
commit 746410fb24055db0046a6d70986efcc6e3d10281
Merge: 23c5259a3 2c93be80d
Author: Nick Mathewson
Date: Wed Sep 20 08:32:55 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/longclaw-ipv6 | 6 ++
src/or/config.c | 1 -
2 files changed, 6 insertions(+), 1 deletion(-)
commit 23c5259a384b435c76b5cae40f68f07aec34d241
Merge: e78347fcc 42e12a353
Author: Nick Mathewson
Date: Mon Sep 18 14:40:36 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
"ours" to avoid version bump.
___
tor-commits mailing l
commit 139bda4fe48e0cdba68c9e802be983fb971e55be
Merge: 9d8d4cb3f 314652dc1
Author: Nick Mathewson
Date: Mon Sep 18 09:40:40 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
___
tor-commits mailing list
tor-commits@lists.torproject.org
ht
commit e468498469ebb2a676e74884a34fa017fa8ac3a4
Merge: 348b225bd f7b06202c
Author: Nick Mathewson
Date: Thu Sep 14 13:21:52 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
"ours" merge to avoid version bump.
___
tor-commits mai
commit dedafe95feff363b0dac086e1f034b88dc112952
Merge: 0729ba286 3138fe2e6
Author: Nick Mathewson
Date: Tue Sep 12 17:09:47 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug15582 | 4
src/test/test_util.c | 21 -
2 files changed, 20 insertion
commit 0729ba2868c42bdd34fb305d858cf2d85030e457
Merge: 2b26815e0 bac160b4e
Author: Nick Mathewson
Date: Tue Sep 12 09:23:57 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
src/common/torgzip.c | 2 ++
1 file changed, 2 insertions(+)
_
commit 2b26815e09760cc84b18791bdbfca27c7b8334f4
Merge: c894e9d3d 6cd5a8027
Author: Nick Mathewson
Date: Mon Sep 11 17:49:18 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug22446 | 4 +++
src/ext/csiphash.c | 14 +-
s
commit c894e9d3d44bceaf209a9b73c2c43911af3eb1a8
Merge: f5092e711 6a49e3360
Author: Nick Mathewson
Date: Mon Sep 11 16:29:10 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug22797| 4
src/common/compat.c | 19 ---
2 files changed, 16 insertions(+)
commit f5092e711fb08dfdf7a356f8c58f10effe6fb831
Merge: a9d4df9a0 3cace828a
Author: Nick Mathewson
Date: Fri Sep 8 08:24:47 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug22644 | 5 +
src/or/control.c | 16
2 files changed, 17 insertions(+), 4 delet
commit a9d4df9a0807704bf5cd1355c57ad0dc2a677a88
Merge: b548371f7 08592c95f
Author: Nick Mathewson
Date: Thu Sep 7 15:18:01 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/geoip-september2017 | 4 +
src/config/geoip| 10802
commit f33c96610f143c71c0309c1021821ab05878f8a0
Merge: 8925e84be 969602159
Author: Nick Mathewson
Date: Thu Aug 3 08:44:31 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/geoip-august2017 | 4 +
src/config/geoip | 10796 --
commit 4d262035280101fcf54ab770ad3341215c261bd8
Merge: f69797b67 58e1c6dd8
Author: Nick Mathewson
Date: Tue Aug 1 11:30:33 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
___
tor-commits mailing list
tor-commits@lists.torproject.org
htt
commit f69797b67cab3c5ad62d5a666b2919c3d29ef1e3
Merge: 84c4a2bc3 8500f0e4e
Author: Nick Mathewson
Date: Tue Aug 1 11:28:39 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
___
tor-commits mailing list
tor-commits@lists.torproject.org
htt
commit 7c68b2f1a500cffbd51aaf534669e1c863de5ec5
Merge: 1d48712c2 2b94b0ea7
Author: Nick Mathewson
Date: Tue Aug 1 11:23:00 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug22245 | 5 +
src/or/hibernate.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
__
commit 1d48712c286981d56c1b3c56b3fc38adc31a1343
Merge: 9d24a352c f6ecda840
Author: Nick Mathewson
Date: Tue Aug 1 11:21:19 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug18100 | 5 +
src/or/connection_edge.c | 4 ++--
2 files changed, 7 insertions(+), 2 dele
commit 9d24a352c01414b14c3ffe02541508345ca32a10
Merge: ad35e595e 925ef048a
Author: Nick Mathewson
Date: Tue Aug 1 11:19:30 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/geoip-july2017 | 4 +
src/config/geoip | 10075 --
commit ad35e595e5070b16ad034315b5082d734f71f181
Merge: 7021d33b9 24ddf5862
Author: Nick Mathewson
Date: Thu Jul 27 08:23:36 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug20247 | 4
src/common/sandbox.c | 8
2 files changed, 12 insertions(+)
__
commit 7021d33b91a3fe4a4d90ad660db4bba5642769f7
Merge: cc4c1840a f17f7a4fd
Author: Nick Mathewson
Date: Wed Jul 26 15:39:56 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
_
commit cc4c1840a6a7fe6e5ff91ce391f6a920fabe0b86
Merge: 18734d3b2 f226d6460
Author: Nick Mathewson
Date: Wed Jul 26 15:37:06 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
.travis.yml | 88
changes/bug22636 | 8 ++
commit 18734d3b25f3a26fea3fd78e64136da9bcd3836d
Merge: 3c017e823 0117e2ea0
Author: Nick Mathewson
Date: Wed Jul 26 12:58:22 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug23030_029 | 7 +++
src/common/util_bug.h | 13 +
2 files changed, 20 insertions(+
commit 3c017e823bdcfeea4316755b208fa2bf9df5fb00
Merge: f5d2f79ac 6d3c5b8fb
Author: Nick Mathewson
Date: Wed Jul 26 12:53:38 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug22915 | 3 +++
src/common/util.c | 16
2 files changed, 19 insertions(+)
___
commit f5d2f79acafc0cb7698442aec3323b2abe802e37
Merge: c1afbbe 3a7d757
Author: Nick Mathewson
Date: Fri Jul 14 09:11:14 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug22916_027| 3 +++
src/test/test_crypto_slow.c | 3 ++-
2 files changed, 5 insertions(+), 1 dele
commit 66c85cd8812c7d862edafc03b8e04bf3555733a3
Merge: 2dd1e21 ed0fb21
Author: Nick Mathewson
Date: Fri Jul 7 10:56:31 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug22838_028 | 5 +
src/test/test_switch_id.c | 1 +
2 files changed, 6 insertions(+)
_
commit 2dd1e21212c470e70be580a41c970380fc3c1bd9
Merge: 55777b3 4858cda
Author: Nick Mathewson
Date: Fri Jul 7 10:51:28 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug22789 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
___
commit 55777b3ff90311212ac3f38829229fed7b7beffe
Merge: 546f5b3 dfc0614
Author: Nick Mathewson
Date: Wed Jul 5 16:11:48 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
src/common/util.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
__
commit 546f5b364bd8198b23b1ad4e66790eb1ce9b438e
Merge: 8bc70a2 32c0066
Author: Nick Mathewson
Date: Wed Jul 5 13:43:31 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug22789 | 6 ++
src/common/compat.c | 8 ++--
src/test/test_addr.c | 9 +
3 files cha
commit 8bc70a2ad2c0363986e4b002ceaf259908d67e70
Merge: d9427c0 bb97f68
Author: Nick Mathewson
Date: Wed Jul 5 11:19:03 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug22801 | 5 +
src/common/util.c | 12
2 files changed, 17 insertions(+)
__
commit 4c21d4ef7ac0ba0b20ee60322ce177c5f965dc0e
Merge: aa5af6a ec9c6d7
Author: Nick Mathewson
Date: Wed Jun 28 14:03:23 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug21507 | 5 +
src/or/routerparse.c | 2 ++
2 files changed, 7 insertions(+)
commit aa5af6a238bc5f1cae548e416ada261b3a105d16
Merge: 75c6fdd 4060253
Author: Nick Mathewson
Date: Wed Jun 28 13:58:37 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
___
tor-commits mailing list
tor-commits@lists.torproject.org
https:
commit a242d194c74b318b8ee4b347efd09ed13d0d2549
Merge: bdd267e 711160a
Author: Nick Mathewson
Date: Tue Jun 27 11:04:44 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug22737 | 12
src/or/connection_or.c | 4 +++-
2 files changed, 15 insertions(+), 1 d
commit 71c701927a27723f0bc9009a044a4bdece55f361
Merge: 493d9cd 1c64133
Author: Nick Mathewson
Date: Mon Jun 19 13:52:19 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug22516 | 5 +
src/common/sandbox.c | 3 +++
2 files changed, 8 insertions(+)
___
commit 493d9cd17b28ff97264502e19b5b2cbb61216721
Merge: ddfb877 cd7d006
Author: Nick Mathewson
Date: Fri Jun 9 09:58:46 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/geoip-june2017 |4 +
src/config/geoip | 5079 +---
sr
commit ddfb87724265f5926abd2469d9f7cbc3893e71a8
Merge: 90758b2 875b1fb
Author: Nick Mathewson
Date: Thu Jun 8 14:06:41 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
"ours" merge to avoid version bump.
___
tor-commits mailing
commit d389480da54dfff4900b5ddf8c0795a02672bafe
Merge: a0664fd 8239af0
Author: Nick Mathewson
Date: Thu Jun 8 09:29:23 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
"ours" merge to avoid version bump.
___
tor-commits mailing
commit 53011e3e54c3d8374c7044b657f90eb723ac39d1
Merge: eb5d05f 987c7ca
Author: Nick Mathewson
Date: Thu Jun 8 09:21:15 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/trove-2017-005 | 7 +++
src/or/relay.c | 3 ++-
2 files changed, 9 insertions(+), 1 deletion(-)
commit ac1ddd5e5bf86b85553b685d6ffa256ef555d94a
Merge: 91f49bc d561da1
Author: Nick Mathewson
Date: Mon Jun 5 16:35:40 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
src/test/test_link_handshake.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --cc src/test/test
commit d1c1dc229e189cbf4e463b82751af007801a02eb
Merge: 7c54d2f 9fea009
Author: Nick Mathewson
Date: Mon Jun 5 15:44:12 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug22460_case2 | 8
src/common/tortls.c| 27 ---
src/
commit 7c54d2f3f0bcf483fd14dedb1a5dcbece6976411
Merge: 578a439 80aca15
Author: Nick Mathewson
Date: Mon Jun 5 14:49:46 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
___
tor-commits mailing list
tor-commits@lists.torproject.org
https:/
commit 578a4392e94faaa85ae79dfe1d4e7e93d0700de5
Merge: 41ed9e9 d75be18
Author: Nick Mathewson
Date: Mon Jun 5 12:02:26 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug22490 | 3 +++
src/or/geoip.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
commit 83439e78cc08f5a05d314de4409e69aa6d1601d7
Merge: 5c52d3c ec61ae5
Author: Roger Dingledine
Date: Thu May 25 00:27:27 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug22370 | 4
src/or/dirserv.c | 7 ++-
2 files changed, 10 insertions(+), 1 deletion(-)
__
commit 5c52d3c2c05a42c9535789d335a51f09a7855d68
Merge: d1340bd 6e5486b
Author: Nick Mathewson
Date: Mon May 22 08:32:07 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug20509 | 5 +
src/or/dirserv.c | 11 +++
2 files changed, 16 insertions(+)
commit 492f8a7c448dbdbea1966bdb9fd1775d3cda16fb
Merge: 8324631 a7bcab2
Author: Nick Mathewson
Date: Tue May 16 08:39:22 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/ticket21564 | 6 ++
src/or/fallback_dirs.inc | 179 +--
commit a868b84599b7591442f40b40b0187c83e8f999b1
Merge: d792d2a 8f5da80
Author: Nick Mathewson
Date: Wed May 10 16:27:15 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/prop275-minimal | 9 +
src/or/networkstatus.c | 5 -
2 files changed, 9 insertions(+), 5 dele
commit d792d2a14ddb7d2ff62dea8ed7d15416b1254348
Merge: f587691 0df22e8
Author: Nick Mathewson
Date: Mon May 8 13:40:26 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug21943 | 6 ++
src/common/sandbox.c | 1 +
2 files changed, 7 insertions(+)
_
commit f5876917aaa5a79577ec27fd8302f75085b41e8e
Merge: 7ae7e3c 5ff0b51
Author: Nick Mathewson
Date: Mon May 8 08:07:38 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/geoip-may2017 |4 +
src/config/geoip | 5862 +++--
src
commit ae374e0a56014b72e54adf2afb5676ae6788124c
Merge: f1613b5 4a9f689
Author: Nick Mathewson
Date: Mon Apr 24 09:20:26 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug22034 | 4
src/or/control.c | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
__
commit a5b50ef25b94e5220655a72417736d09dbd4a3c5
Merge: 06fe8a1 7d7770f
Author: Nick Mathewson
Date: Thu Apr 6 08:32:04 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/geoip-april2017 | 4 +
src/config/geoip| 14366 +-
commit ded2c8c6894e6de2784e60d0d9cafec911fc9b9b
Merge: 552bc39 d642ceb
Author: Nick Mathewson
Date: Wed Mar 8 10:12:27 2017 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/geoip-march2017 | 4 +
src/config/geoip| 13115 +++---
commit 5ff31ff5b34fd69383b366d38e997822f0442086
Merge: f2ca22f 7549259
Author: Nick Mathewson
Date: Wed Mar 1 08:19:23 2017 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
"Ours" merge to avoid version bump
___
tor-commits mailing l
commit 4128a8cabdb530fcbe1dda5a21887d7728e4d752
Merge: 3a60214 b049a5b
Author: Nick Mathewson
Date: Tue Feb 28 10:39:29 2017 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
This is an "ours" merge to avoid a version bump.
___
tor-co
commit 5dbbd6bc392892df63a02cf601f94fa1fae6ebfc
Merge: 3336f26 67cec75
Author: Nick Mathewson
Date: Fri Feb 17 11:32:45 2017 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
src/or/routerparse.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
__
89 matches
Mail list logo