[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit c604a76a53204eb20af0fab0a9f1f49fba393fd9 Merge: eecfed0cd 877dd1d6c Author: Nick Mathewson Date: Wed Dec 20 12:15:23 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-2017-12-06 | 4 + src/config/geoip | 12380

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit eecfed0cd2c8c92175106e211d1662fa43fc60bc Merge: eaaa1108a f7151387d Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit eaaa1108a3eb1271ad2c8f3fbb8a6845d24de874 Merge: 7e486dd6f bc1ea4f47 Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 953a8f851081e6157e9296186c296ab10106b7eb Merge: 495db72c1 f97f301b5 Author: Nick Mathewson Date: Fri Dec 1 12:13:40 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24480 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 495db72c1eee7f9ed890ae252eb5b61a70438065 Merge: 73869c99a dc3890439 Author: Nick Mathewson Date: Fri Dec 1 09:35:07 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump.

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 7e2b012b46a4ade2818e47be15d76255cf6f121e Merge: 52d7af631 ba4a9cf0c Author: Nick Mathewson Date: Thu Nov 30 12:07:59 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24313 | 5 + changes/trove-2017-009 | 10 ++

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 1fd6e25522ed064e8043f4548fbd33fca9246295 Merge: 7e2b012b4 6ee447254 Author: Nick Mathewson Date: Thu Nov 30 12:22:38 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump.

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 30b3229252709eeca054ee06cc6e366226723e24 Merge: 53c3174ee 25c90230b Author: Nick Mathewson Date: Mon Nov 27 09:09:34 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bastet_v6 | 4 src/or/config.c | 1 + 2 files changed, 5 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 53c3174ee43c3f54f8180be8256180f6f0d24c0d Merge: 1b9bb2c84 d388f9d87 Author: Nick Mathewson Date: Sat Nov 18 11:01:43 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug18329-minimal | 6 ++ src/or/router.c | 9 + 2 files

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 543fd89fb7fe4817b5e59beb132f5331ee7a2f48 Merge: ab415ae95 800797e7f Author: Nick Mathewson Date: Mon Nov 13 12:57:58 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug23291| 3 +++ src/test/test-memwipe.c | 2 +- 2 files changed, 4

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 9666c620d584b2c715596b415a808941b17cbda0 Merge: 04d4786cc c9b76a12f Author: Nick Mathewson Date: Sat Nov 11 12:23:33 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-2017-11-06 |4 + src/config/geoip | 9406

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 151d5ededf9fb334a5195904945f95cf626f51bc Merge: 46091a88c faf568fa7 Author: Nick Mathewson Date: Wed Oct 25 09:28:29 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 725f2371042b36c151a42e575a5b319d3820126c Merge: 09d2ae562 912ebf165 Author: Nick Mathewson Date: Tue Oct 24 09:10:17 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit fcd5c3144a44f4081e9e7c4336b932e31ae45f77 Merge: 1db5081ba a5f5bda46 Author: Nick Mathewson Date: Mon Oct 23 09:11:10 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 1db5081ba1e9201673dac296957a6d8b0a694855 Merge: c958fda6e 8cc147aa8 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit c958fda6e29265b12b987ee8445873c25629ae71 Merge: 132e2f69b 9a1b38546 Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 132e2f69b1068b139d3c114fddd6efe58d6fc8f4 Merge: fcaf3335b 6f87a8589 Author: Nick Mathewson Date: Mon Oct 23 08:53:25 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug23690 | 5 + src/or/circuitlist.c | 1 + 2 files changed, 6

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 43ebe54a24d3210ef037f7e2b67fad9597361bab Merge: 2984d9916 91c17ffbd Author: Nick Mathewson Date: Thu Oct 5 11:04:59 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-october2017 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 2984d991653b70fcd561d7d0bd693c46220cec74 Merge: 2c93be80d d6bdec159 Author: Nick Mathewson Date: Thu Oct 5 11:03:35 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-october2017 |4 + src/config/geoip | 8683

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 2c93be80d9ad0712b5716c85e32f7a5184f3b1d2 Merge: 42e12a353 8e52c4658 Author: Nick Mathewson Date: Wed Sep 20 08:32:55 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/longclaw-ipv6 | 6 ++ src/or/config.c | 1 - 2 files changed, 6

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 42e12a3537fef04ab77defd6cb5581add439de43 Merge: a57f1ff7a 0a72d1c8f Author: Nick Mathewson Date: Mon Sep 18 14:40:22 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" to avoid version bump.

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 314652dc16ece380de343ccdc5a2155d612bcff7 Merge: f7b06202c 0ec72b030 Author: Nick Mathewson Date: Mon Sep 18 09:39:46 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/trove-2017-008 | 5 + src/or/rendservice.c | 4 ++-- 2 files changed, 7

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.3.0

commit 7df790890593de1cc2aef84305102f80c00bb8f8 Merge: e46849846 0ec72b030 Author: Nick Mathewson Date: Mon Sep 18 09:40:09 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.3.0 This is an "ours" merge to avoid the conflict from the 0.2.8 version of the

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit f7b06202c787d117eb22f04798a6f3f4b6722af1 Merge: 3c6d4fe04 26f68dfce Author: Nick Mathewson Date: Thu Sep 14 13:21:28 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump.

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 08592c95fa30703beee7b65cc5bdb8923cbe4bcb Merge: 969602159 bcf2b413c Author: Nick Mathewson Date: Thu Sep 7 15:18:00 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-september2017 | 4 + src/config/geoip| 10802

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 9696021593d28a7ae3b6a88ac57ff31234b469f5 Merge: 58e1c6dd8 93b28972c Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-august2017 | 4 + src/config/geoip | 10796

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 925ef048a977ccee0edb44ba68db2397b36d8c92 Merge: 24ddf5862 0e7558ab6 Author: Nick Mathewson Date: Tue Aug 1 11:19:29 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-july2017 | 4 + src/config/geoip | 10075

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit f17f7a4fdf1037a2cabe7c766231da244e30e692 Merge: f226d6460 5c5eb0f09 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit dcc477cb53cda792c433b01c21f45cd4415c984d Merge: 0117e2ea0 fbf93614c Author: Nick Mathewson Date: Wed Jul 26 15:35:17 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 .travis.yml | 88

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit ed0fb218342dcf7cc54f6abd9078dcd3efa5452c Merge: 4858cda 48e45e2 Author: Nick Mathewson Date: Fri Jul 7 10:56:31 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug22838_028 | 5 + src/test/test_switch_id.c | 1 + 2 files changed, 6

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 4858cda2dfc61bb32269aea4f6978d6458fb Merge: dfc0614 c1e4aff Author: Nick Mathewson Date: Fri Jul 7 10:51:28 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug22789 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 32c0066e4baa2ca16902a70b941d8d3afbc279ff Merge: bb97f68 5ff0f1a Author: Nick Mathewson Date: Wed Jul 5 13:43:21 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug22789 | 6 ++ src/common/compat.c | 8 ++-- src/test/test_addr.c | 9

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 711160a46f5fbba7106c23c29f99bed75928a5a7 Merge: 1c64133 3483f7c Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit cd7d006e0829ac83c1d9e5f04fff9ca239973014 Merge: 875b1fb 307be8d Author: Nick Mathewson Date: Fri Jun 9 09:58:46 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-june2017 |4 + src/config/geoip | 5079

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 875b1fbfba7bd4b1246c3d97b846e1ff77d0535a Merge: 5e55421 6e90d75 Author: Nick Mathewson Date: Thu Jun 8 14:06:28 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 ___ tor-commits mailing list

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 8239af0d9cb3e45e4c5ff04ab057450934e306cf Merge: b533220 bff08ed Author: Nick Mathewson Date: Thu Jun 8 09:29:12 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump.

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 987c7cae7073ba2c579cc81f973446831246858d Merge: d561da1 d15d09a Author: Nick Mathewson Date: Thu Jun 8 09:21:15 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/trove-2017-005 | 7 +++ src/or/relay.c | 3 ++- 2 files changed, 9

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 80aca1501ae080ddb9c8f457290226dd5453b08a Merge: d75be18 d850d27 Author: Nick Mathewson Date: Mon Jun 5 14:49:46 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 ___ tor-commits mailing list

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit d75be189df970f0da3a59f649e3be9c5d57868c6 Merge: ec61ae5 33fcc0f Author: Nick Mathewson Date: Mon Jun 5 12:02:15 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug22490 | 3 +++ src/or/geoip.c | 2 +- 2 files changed, 4 insertions(+), 1

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit a7bcab263959887b27500372bc6fa1fa0f8c947b Merge: 8f5da80 5b45d73 Author: Nick Mathewson Date: Tue May 16 08:38:59 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket21564 | 6 ++ src/or/fallback_dirs.inc | 179

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 5ff0b519ecee6e3d0b6d4550bd74f197a818b08d Merge: 4a9f689 dc34cd7 Author: Nick Mathewson Date: Mon May 8 08:07:32 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-may2017 |4 + src/config/geoip | 5862

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 7d7770f7359763871667e0150aebc50856f9d5fd Merge: d642ceb 91c6b18 Author: Nick Mathewson Date: Thu Apr 6 08:31:54 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-april2017 | 4 + src/config/geoip| 14366

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit d642ceb8dff5e837bc0e27f9f50812beece06401 Merge: 7549259 2cfecec Author: Nick Mathewson Date: Wed Mar 8 10:12:06 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-march2017 | 4 + src/config/geoip| 13115

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 3e07a54928c3b14b4eb86b05251564c3e16504c4 Merge: 67cec75 f93bcab Author: Nick Mathewson Date: Tue Feb 28 10:38:31 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 This is an "ours" merge to avoid taking a version bump

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' of git-rw.torproject.org:/tor into maint-0.2.8

commit 71cd68b66b82aa2103abb0a02359af6c48db84b7 Merge: 1ebdae6 9ff7618 Author: Nick Mathewson Date: Wed Feb 15 07:51:57 2017 -0500 Merge branch 'maint-0.2.8' of git-rw.torproject.org:/tor into maint-0.2.8 changes/bug20384 | 10 -- 1 file changed, 10

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit a1c3b391de98e73528d042a8b4c9d804b6d5bf57 Merge: 5d88267 5222054 Author: Nick Mathewson Date: Wed Feb 15 07:52:54 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 ___ tor-commits mailing list

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit eeb743588af0ec09150bd7601d553bfbabba97ac Merge: 4a2afd5 1ebdae6 Author: Nick Mathewson Date: Wed Feb 15 07:48:10 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/trove-2017-001.2 | 8 src/or/routerparse.c | 49

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 4a2afd5b33f02ed3e5eb591dd29537fa4f69399f Merge: a86f95d 9ff7618 Author: Roger Dingledine Date: Mon Feb 13 15:41:20 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 ___ tor-commits mailing list

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit a86f95df5c34df2921e8f3e76f171c0576fc2a20 Merge: 23f1caf 9b90d51 Author: Nick Mathewson Date: Mon Feb 13 14:38:03 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-february2017 | 4 + src/config/geoip | 10832

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 23f1caf2af300c55a33b7cb3f1671b0b9c2f73f2 Merge: 65cda78 eca4a89 Author: Nick Mathewson Date: Tue Feb 7 10:39:23 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 ___ tor-commits mailing list

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 65cda78ec6037da8059526d1c23449013f921ed2 Merge: a271ad2 a9f936d Author: Nick Mathewson Date: Tue Feb 7 09:30:19 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 ___ tor-commits mailing list

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 3e5b1c2d95d2270d2e7b9e137c5ec04e0e534659 Merge: 946661d b60fb3a Author: Nick Mathewson Date: Tue Feb 7 09:20:52 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 ___ tor-commits mailing list

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 946661d1dba09dda7af65a2cec8246be43299709 Merge: 0f46f7d 93ea18e Author: Nick Mathewson Date: Tue Feb 7 08:55:35 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 ___ tor-commits mailing list

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 0f46f7d1ec8064ffc5573d60819fc7f231497e12 Merge: b928095 7b24f3e Author: Nick Mathewson Date: Tue Feb 7 08:39:39 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 ___ tor-commits mailing list

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 0809690b481b37fae56a65171e6507e30e763bfa Merge: c27ae62 c77ace6 Author: Nick Mathewson Date: Wed Jan 11 09:13:34 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-january2017 |4 + src/config/geoip | 3160

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 490cd038693b89c30b60fd8682fd631f5581f458 Merge: a9bfa99 cb2e205 Author: Nick Mathewson Date: Tue Dec 20 18:23:54 2016 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 ___ tor-commits mailing list

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit a9bfa997aeb33babc7bbcb314891122b07e6dbfa Merge: 897d3c6 7f55aaf Author: Nick Mathewson Date: Tue Dec 20 18:15:56 2016 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 ___ tor-commits mailing list

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 8f043ffc647bf129e8a6d0c5991586fac880c489 Merge: 24318fb f62c74c Author: Nick Mathewson Date: Mon Dec 19 10:12:34 2016 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 "Ours" merge to avoid version bump.

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit c9009ccf92d9a759d9135bcf872640f769f93a00 Merge: de65647 b838e1f Author: Nick Mathewson Date: Mon Dec 19 08:07:56 2016 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump.

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit de656474611c43f24dd5fff430de945b34b738bf Merge: 169a93f c11de4c Author: Nick Mathewson Date: Mon Dec 19 07:58:43 2016 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug21018 | 11 +++ src/or/rendcache.c | 4 +++- src/or/routerparse.c

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 169a93fff2510cf0eae76cdd198c19687bb1e875 Merge: 8384f4d e030632 Author: Nick Mathewson Date: Mon Dec 19 07:30:42 2016 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket20170-v3 | 5 + src/or/fallback_dirs.inc | 392

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit adaf6a422af84a7402c2199d2c9be89a7e3f9e02 Merge: 9bb3bcb 56a2b8d Author: Nick Mathewson Date: Fri Dec 9 08:34:24 2016 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-december2016 |4 + src/config/geoip | 6259

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit f9636ebc2f70544f8b86eb7e3a86a85c81349f8e Merge: 5d4ff91 d47c52b Author: Nick Mathewson Date: Thu Dec 8 11:03:08 2016 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 "Ours" merge to avoid bumping version.

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 30f05167f1b1dd26427a80db6494842f40049cb7 Merge: cf2f36b cc34ba1 Author: Nick Mathewson Date: Mon Dec 5 10:06:45 2016 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 ___ tor-commits mailing list

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 0d0c7a11649db161070ab96310ff301be6dd704c Merge: 907cd8a 2a36541 Author: Nick Mathewson Date: Mon Dec 5 08:05:37 2016 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 ___ tor-commits mailing list

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 70d39859d63344ac7cce4f69cb6a7ad510a8cc32 Merge: cf762c6 1122137 Author: Nick Mathewson Date: Fri Dec 2 11:20:27 2016 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 ___ tor-commits mailing list

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 82bd2af78df57206bdcc81e7343a78b7f07c4a1b Merge: 52cb1ed 9157405 Author: Nick Mathewson Date: Thu Dec 1 13:35:34 2016 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 ___ tor-commits mailing list

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit e4b793fe41fc09cc1f7753cfe90b74095a49a34f Merge: d82ffb7 2639fd0 Author: Nick Mathewson Date: Mon Nov 7 09:32:00 2016 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-november2016 |4 + src/config/geoip | 4025

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 59f4cae68c00e6b894e68d8cfefae295a8b9eb89 Merge: 3cd520a 61bdc45 Author: Nick Mathewson Date: Thu Nov 3 18:36:43 2016 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug20551| 3 +++ src/common/tortls.c | 8 2 files changed, 7

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 3cd520a52d50b9e901d33d0164d847d12a278f1b Merge: 3bb49c0 7a45ef5 Author: Nick Mathewson Date: Thu Nov 3 15:44:46 2016 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug19969 | 10 ++ src/or/connection_edge.c | 9 +

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

commit 3bb49c011006d042f8a3f802d7abb3e9da51b15b Merge: ff3e08f 9b18b21 Author: Nick Mathewson Date: Thu Nov 3 15:41:04 2016 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug20553| 3 +++ src/common/crypto.c | 5 ++--- src/tools/tor-gencert.c

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit 6e823a27f114523c566b99a4deb3900764570954 Merge: 702c1dc b0f1241 Author: Nick Mathewson Date: Mon Oct 17 16:32:31 2016 -0400 Merge branch 'maint-0.2.8' "ours" commit to avoid bumping version. ___ tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit 3b6f924e507d15fc7290649738048db9c79ec70d Merge: 52b2b2c 0fa3811 Author: Nick Mathewson Date: Mon Oct 17 14:57:44 2016 -0400 Merge branch 'maint-0.2.8' ("ours" merge to avoid taking version bump) ___

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit 1a7488106326d2327fc24f32b13979b7029b813b Merge: eae0c00 1df1143 Author: Nick Mathewson Date: Mon Oct 17 14:51:45 2016 -0400 Merge branch 'maint-0.2.8' changes/buf-sentinel | 11 +++ src/or/buffers.c | 40 2

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit 7410adb330ae71ee70a63dfb76a3c446ff9e28f4 Merge: 6055bba ab98c43 Author: Nick Mathewson Date: Thu Oct 6 09:59:49 2016 -0400 Merge branch 'maint-0.2.8' changes/geoip-october2016 | 4 + src/config/geoip | 63919

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit 9db7bd08f0a04133fcf4ee976d1b8f9a321de5a9 Merge: 9965059 ec19ecc Author: Nick Mathewson Date: Fri Sep 23 15:58:40 2016 -0400 Merge branch 'maint-0.2.8' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit 6a011645381745ecb6f798b332124c4c95b6b0c1 Merge: 5d1095b db6153e Author: Nick Mathewson Date: Fri Sep 23 09:30:56 2016 -0400 Merge branch 'maint-0.2.8' changes/broken-028-fallbacks | 3 +++ src/or/fallback_dirs.inc | 6 -- 2 files changed, 7

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit f5deb2feaa0105610002459ad3f0defd3f33a534 Merge: 077f6a4 ad1824f Author: Nick Mathewson Date: Thu Sep 22 15:37:27 2016 -0400 Merge branch 'maint-0.2.8' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit 077f6a4888e88a4895e7b2234ff2fd81412307d0 Merge: 0baa276 d78711c Author: Nick Mathewson Date: Thu Sep 22 15:20:31 2016 -0400 Merge branch 'maint-0.2.8' changes/bug20203 | 6 ++ src/or/circuitlist.c | 10 -- src/or/relay.c | 9 +

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit 6deeedb5e09fc0998ab5d4e2fc53415bc6dc5c39 Merge: 4c69ba5 1edea87 Author: Nick Mathewson Date: Thu Sep 22 09:00:37 2016 -0400 Merge branch 'maint-0.2.8' changes/bug20103| 2 +- changes/geoip-september2016 | 2 +- 2 files changed, 2 insertions(+), 2

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit 62ee4f185f984f11d75522eedcee92d1f15fc7a6 Merge: 06d99aa 9ebe202 Author: Nick Mathewson Date: Tue Sep 20 19:30:45 2016 -0400 Merge branch 'maint-0.2.8' changes/bug20103 | 7 +++ src/or/networkstatus.c | 24 +--- 2 files changed,

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit 06d99aa2c42de6013b3fa55ac03c661f57f90047 Merge: 32926b0 19a9872 Author: Nick Mathewson Date: Tue Sep 20 19:29:17 2016 -0400 Merge branch 'maint-0.2.8' src/or/fallback_dirs.inc | 46 ++ 1 file changed, 30

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit f028434a5feb4b8db7c7219fe1b595a000dd4d03 Merge: 9d933bb 6494f33 Author: Nick Mathewson Date: Wed Sep 7 13:54:21 2016 -0400 Merge branch 'maint-0.2.8' changes/geoip-september2016 | 4 + src/config/geoip| 30846

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit 20136a8207f0cda0d23093a884caae0358f98bac Merge: 7be7f42 e9124b8 Author: Nick Mathewson Date: Wed Aug 24 14:46:27 2016 -0400 Merge branch 'maint-0.2.8' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit 7d410a6b0d462e0838c5fca2eec089693104a514 Merge: e2ede7c 57ba7ab Author: Nick Mathewson Date: Wed Aug 24 11:02:10 2016 -0400 Merge branch 'maint-0.2.8' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit 51329054199e2b7eb3aed46282028f04e13a13ad Merge: 297635f 5280a70 Author: Nick Mathewson Date: Wed Aug 24 10:45:11 2016 -0400 Merge branch 'maint-0.2.8' changes/bug19973 | 6 ++ src/or/circuitbuild.c | 9 +++-- src/or/or.h | 5 -

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit 297635f806ec4244c4e6e6f093f87d647061d42a Merge: 8feb301 d3a975e Author: Nick Mathewson Date: Wed Aug 24 10:03:19 2016 -0400 Merge branch 'maint-0.2.8' changes/bug19728 | 3 +++ src/or/config.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit 62b239dd9c3c1945a72062223f5b131204ea987a Merge: 3c8baa7 0ba0531 Author: Nick Mathewson Date: Mon Aug 22 10:19:15 2016 -0400 Merge branch 'maint-0.2.8' changes/bug19947| 4 src/or/routerlist.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit 8f2f06c9b38015f641d0505e805a8285884f55ba Merge: 5e57190 65cf513 Author: Nick Mathewson Date: Fri Aug 19 19:35:39 2016 -0400 Merge branch 'maint-0.2.8' changes/bug19903| 4 src/common/tortls.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit a7e317927b9901a5b1d1d8de010093816da76425 Merge: e788c57 459e5d7 Author: Nick Mathewson Date: Fri Aug 12 10:27:23 2016 -0400 Merge branch 'maint-0.2.8' changes/geoip-august2016 | 4 + src/config/geoip | 14009

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit 253f8140c862c24762181a6c6dc6bbba97d4e96c Merge: 8c2ee16 6b740aa Author: Nick Mathewson Date: Tue Aug 2 11:14:08 2016 -0400 Merge branch 'maint-0.2.8' (This is an "ours" merge to avoid taking the version number bump.)

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit 261f4c3f6f028cf4becff1077c08735e308d7d43 Merge: f3575a4 11386eb Author: Nick Mathewson Date: Fri Jul 29 11:17:49 2016 -0400 Merge branch 'maint-0.2.8' ("Ours" merge, to avoid bumping version in master) ___

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit f3575a45cec35f3dee1bcef9237d5e63052405b5 Merge: 1995328 1c4a2dd Author: Nick Mathewson Date: Fri Jul 29 10:23:38 2016 -0400 Merge branch 'maint-0.2.8' changes/bug19782 | 3 +++ scripts/maint/fallback.blacklist | 3 +++

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit 9c87869dde2fdae5ef624700a567c6ffc1e964c8 Merge: 22314f9 f1973e7 Author: Nick Mathewson Date: Thu Jul 21 14:15:19 2016 +0200 Merge branch 'maint-0.2.8' src/common/sandbox.c | 1 - 1 file changed, 1 deletion(-) ___

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit a31078a581c35310cd642b16ce57efd5b888f6dc Merge: 558f7d3 4d5b252 Author: Nick Mathewson Date: Tue Jul 19 12:34:37 2016 +0200 Merge branch 'maint-0.2.8' changes/geoip-july2016 |4 + src/config/geoip | 4615

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit c138c9a2be868c4d8bad4e6ae5637205f1bdcf0f Merge: 9932544 fbae15a Author: Nick Mathewson Date: Sun Jul 17 13:55:04 2016 -0400 Merge branch 'maint-0.2.8' changes/bug19660| 8 changes/bug19682| 3 +++ src/common/sandbox.c

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit 9932544297e02dc4f79d70317f214bcbb2dd8e9a Merge: 3ac4341 c1bfa65 Author: Nick Mathewson Date: Wed Jul 13 09:19:35 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18397 | 7 +++ src/common/sandbox.c | 20 2 files changed, 27

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit 663b659434267f1c8edb1a130f10d6f3a91da831 Merge: bfd5000 a931d15 Author: Nick Mathewson Date: Thu Jul 7 12:44:07 2016 -0400 Merge branch 'maint-0.2.8' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit 9c1d8cdd8d22f4004a0dec144527d73656bace2d Merge: 3252550 b167e82 Author: Nick Mathewson Date: Wed Jul 6 10:17:22 2016 -0400 Merge branch 'maint-0.2.8' changes/bug19608 | 6 ++ src/or/policies.c | 36 +++- 2 files changed,

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit 85c39b647dbd4483da469b029f2273b8d2ae11bd Merge: 5a047cd 4f4d77c Author: Nick Mathewson Date: Tue Jul 5 13:53:28 2016 -0400 Merge branch 'maint-0.2.8' changes/19271 | 2 ++ 1 file changed, 2 insertions(+) ___

  1   2   >