[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

commit a48ae2aa67b31cc97942ac2c7fd6f29beba59e3b Merge: ddd66cc01 6862eada6 Author: Nick Mathewson Date: Tue Aug 1 11:19:29 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/geoip-july2017 | 4 + src/config/geoip | 10075

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

commit ddd66cc01911da301ef61813c951418996c19593 Merge: c362c6a85 f794b40ec Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

commit c362c6a852d0c7a08d7abb28450a21975e42f55e Merge: 5472066cd 0ad5a6b03 Author: Nick Mathewson Date: Wed Jul 26 15:35:01 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux .travis.yml | 88

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

commit 5472066cd21099d406e69ef810b83c153bd21e5b Merge: 6cd6d48 7151854 Author: Nick Mathewson Date: Fri Jul 7 10:51:28 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/bug22789 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

commit 6cd6d488dc2469df82d74f0fcc3c84f5b45e8447 Merge: 9a0fd2d f6420bc Author: Nick Mathewson Date: Wed Jul 5 13:42:37 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/bug22789 | 6 ++ src/common/compat.c | 8 ++--

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

commit 9a0fd2dbb187e898f63064c483776538a90562f1 Merge: 24ee859 3de2761 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

commit 24ee8595bf3aa8648d37c2f94277c33bfbc8db64 Merge: 2f6be06 3913f95 Author: Nick Mathewson Date: Fri Jun 9 09:58:45 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/geoip-june2017 |4 + src/config/geoip | 5079

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

commit 2f6be06f6a0a563bc07c089bf498b1d3792ae01f Merge: 44c8cb9 eb92d11 Author: Nick Mathewson Date: Thu Jun 8 14:06:06 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux "ours" merge to avoid version bump.

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

commit 4915d9c5a7fc8db2497258a293137426cbd0d665 Merge: 2efe027 b796ad0 Author: Nick Mathewson Date: Thu Jun 8 09:28:54 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux "ours" merge to avoid version bump.

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

commit c1646d6e894f11fe3a363468d7a668648f2d63d7 Merge: 9a6f938 40bccc2 Author: Nick Mathewson Date: Thu Jun 8 09:21:15 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/trove-2017-005 | 7 +++ src/or/relay.c | 3 ++- 2 files changed, 9

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

commit 9a6f93858267ba2d68f1f092498a06f5115126c4 Merge: 3f2d1f7 a56cfda Author: Nick Mathewson Date: Mon Jun 5 14:48:30 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux ___ tor-commits mailing list

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

commit 3f2d1f7f0730a17b81d2fb94df9b6a5b8b277893 Merge: 71dd1d7 9ea3d08 Author: Nick Mathewson Date: Mon Jun 5 12:00:41 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/bug22490 | 3 +++ src/or/geoip.c | 2 +- 2 files changed, 4 insertions(+), 1

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

commit 71dd1d716ac83d98ab4592f46b984338a1a7685b Merge: 44bc882 159ddf6 Author: Nick Mathewson Date: Mon May 8 08:07:11 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/geoip-may2017 |4 + src/config/geoip | 5862

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

commit 44bc8821b108925e761769b383a0f28e29823000 Merge: 25c28bc 21d7767 Author: Nick Mathewson Date: Thu Apr 6 08:31:23 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/geoip-april2017 | 4 + src/config/geoip| 14366

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

commit 25c28bc2d920ffa0fe36c2de7833735255582c3a Merge: b5526be ecc73c3 Author: Nick Mathewson Date: Wed Mar 8 10:11:05 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/geoip-march2017 | 4 + src/config/geoip| 13115

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

commit e91bb84a91ff019250f19039c26df4f40c1c7544 Merge: 7a489a6 5446cb8 Author: Nick Mathewson Date: Tue Feb 7 09:57:08 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7-redux maint-0.2.7-redux is an attempt to try to re-create a plausible maint-0.2.7

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

commit 1174b50cab48be08b321deced0cfa022160d2c40 Merge: aec45bc 57e778f Author: Nick Mathewson Date: Tue Feb 28 10:26:45 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7-redux "ours" merge to avoid version bumps

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

commit aec45bc0b1d5c694b107373f8d6e3ddd1372defc Merge: 8a1f087 f7ed4a7 Author: Nick Mathewson Date: Fri Feb 17 17:10:47 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/bug20384 |10 + changes/geoip-february2017 | 4 +

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

commit 8a1f0876ed329f6c9d73e6ca786cd8437e6bb55b Merge: 3f5a710 f2a3041 Author: Nick Mathewson Date: Tue Feb 7 10:38:05 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/bug16248 | 8 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit e6376a8004072fde832da77aa6369075dcdcbe8b Merge: 67877f5 f7ed4a7 Author: Nick Mathewson Date: Wed Feb 15 07:52:41 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 ___ tor-commits mailing list

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit ed806843dc8e7942a2a0abfbb2ae374e11963feb Merge: 75fe218 3781f24 Author: Nick Mathewson Date: Wed Feb 15 07:47:21 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/bug20384 | 10 ++ changes/trove-2017-001.2 | 8

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit 5c4235888af142b72aa6b88737bcf1020797e35c Merge: 75fe218 e778a41 Author: Roger Dingledine Date: Mon Feb 13 15:28:50 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/bug20384 | 10 ++ 1 file changed, 10 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit 75fe218b166b4d4e46b50205104e9eeaa136e904 Merge: 4bce207 43c18b1 Author: Nick Mathewson Date: Mon Feb 13 14:37:49 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-february2017 | 4 + src/config/geoip | 10832

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit 4bce2072acaca38d40086c943d8f332ed2c2cf50 Merge: 86d5a6f f2a3041 Author: Nick Mathewson Date: Tue Feb 7 10:39:03 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit 86d5a6fac04a3f78b3bd2a8a7a1f2d9776010334 Merge: 0a43134 5446cb8 Author: Nick Mathewson Date: Tue Feb 7 09:29:27 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 "ours" merge to avoid reverting 17354, which was already fixed in 0.2.7.4-rc.

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit 0a43134009a431ecd734a4c122d5de0d63529800 Merge: 115cefd c6f2ae5 Author: Nick Mathewson Date: Tue Feb 7 09:20:13 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 This is an "ours" merge to avoid conflicts on the authority list: the 0.2.7

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit 115cefdeeefd99f435948bfe42b1ce842019edfb Merge: eb72365 e6965f7 Author: Nick Mathewson Date: Tue Feb 7 08:55:07 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/rsa_init_bug | 7 +++ src/common/crypto.c | 4 +++- 2 files changed, 10

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit eb72365554451f5e129169bb1216a9610f7ff183 Merge: 8c91cbb 8936c50 Author: Nick Mathewson Date: Tue Feb 7 08:39:25 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 ___ tor-commits mailing list

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit 8c91cbb6ca579145e84f940953c33911eb1ce72b Merge: 2673b4b 54771bc Author: Nick Mathewson Date: Wed Jan 11 09:12:51 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-january2017 |4 + src/config/geoip | 3160

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit 2673b4b7a87bbdc880dd235f490dfb7b8f3c64c9 Merge: a9c8a5f b6227ed Author: Nick Mathewson Date: Tue Dec 20 18:23:19 2016 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/buf-sentinel | 11 +++ src/or/buffers.c | 40

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit a9c8a5ff18c1944ddcea0116419edc2f199583b8 Merge: b49369b b18bde2 Author: Nick Mathewson Date: Tue Dec 20 18:14:21 2016 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/bug21018 | 11 +++ src/or/rendcache.c | 6 --

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit b49369badd28d5895f1d26b74be888298246b05a Merge: f5fdf18 3d9f8ff Author: Nick Mathewson Date: Fri Dec 9 08:34:12 2016 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-december2016 |4 + src/config/geoip | 6259

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit f5fdf188b9c2e218e89f55e4fb26fcd3b2abe44b Merge: ec718aa 6c2174d Author: Nick Mathewson Date: Mon Nov 7 09:30:42 2016 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-november2016 |4 + src/config/geoip | 4025

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit ec718aa83914e848ca9ee5e828731477a410e484 Merge: 11edbf4 12a7298 Author: Nick Mathewson Date: Thu Oct 6 09:59:18 2016 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-october2016 | 4 + src/config/geoip | 63919

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit 11edbf480870975a354ec13ee67958492a0fd690 Merge: f60da19 52a99cb Author: Nick Mathewson Date: Wed Sep 7 13:54:03 2016 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-september2016 | 4 + src/config/geoip| 30846

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit db372addc8534dc6e4639fe943179943b276b051 Merge: 4d70ed7 742ff2c Author: Nick Mathewson Date: Fri Aug 12 10:27:08 2016 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-august2016 | 4 + src/config/geoip | 14009

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit 4d70ed7be097593ab9ef80b52540e49d30baaf03 Merge: 7c25b41 210928f Author: Nick Mathewson Date: Tue Jul 19 12:32:14 2016 +0200 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-july2016 |4 + src/config/geoip | 4615

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit 7c25b41c8cfffebddbc7ba4d66aa345642eebc1f Merge: 6e96aad 92891de Author: Nick Mathewson Date: Tue Jul 5 13:52:04 2016 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/19271 | 2 ++ 1 file changed, 2 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit 6e96aadadbe9ac49582c770e9ff11b3c2876abf3 Merge: 80089c9 c28ba99 Author: Nick Mathewson Date: Tue Jul 5 12:22:47 2016 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7 src/or/config.c | 3 --- 1 file changed, 3 deletions(-) diff --cc src/or/config.c index

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit 80089c9e7c16f38e398e99cbc773c3182cee9229 Merge: 5854b19 b4bb886 Author: Nick Mathewson Date: Mon Jun 13 10:48:56 2016 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-jun2016 |4 + src/config/geoip | 3349

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit 7fe80c29056d7e98b9443e151343c886cf8c7dd3 Merge: 1a065ce 0b477bf Author: Nick Mathewson Date: Mon May 9 14:56:56 2016 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-may2016 |4 + src/config/geoip | 6991

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit ad4ff7a5b93a9236b6084548798815540ad91cbe Merge: 183d465 2ce99b9 Author: Nick Mathewson Date: Thu Apr 7 10:45:46 2016 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-april2016 |4 + src/config/geoip| 3255

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit 17cfdb358cae63477a120182784599dae0538cd7 Merge: 67e5d49 443dddb Author: Nick Mathewson Date: Wed Mar 9 10:36:50 2016 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-march2016 |4 + src/config/geoip| 8496

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit be6174f8f6aaaf8f990eb56c5cba16bc5ec0fcea Merge: d920cbb 740421a Author: Nick Mathewson Date: Thu Feb 11 13:01:46 2016 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/bug18162 | 7 +++ src/common/container.c | 37

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit d920cbb82c2203b328d66d6c9d8f28fd35608560 Merge: 7d1fe7c 44ad3be Author: Nick Mathewson Date: Fri Feb 5 08:13:35 2016 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-february2016 |4 + src/config/geoip | 2144

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit 534a0ba59b4d772b0e3e6a1dfc5050d534fdb9fc Merge: 8335b1f e2efa9e Author: Nick Mathewson Date: Tue Jan 19 08:30:39 2016 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 src/common/crypto.c |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit 8335b1f9a91076f100e7d3ba6b45f3ed9fc2986a Merge: 83dfcfb db81565 Author: Nick Mathewson Date: Mon Jan 18 20:00:16 2016 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/bug18089|6 ++ src/common/crypto.c |8 2 files changed, 14

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit eeb9751eadd148e5077cedb28f75e756b47281c0 Merge: e9bf584 b53ff86 Author: Nick Mathewson Date: Tue Dec 8 09:43:42 2015 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/bug17781 |3 +++ 1 file changed, 3 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit c6a337557ae5c73e8dc8208b18f902e9eeb21404 Merge: eeb9751 1adc2bf Author: Nick Mathewson Date: Tue Dec 8 10:23:41 2015 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/bug17772|7 +++ src/or/routerlist.c | 10 -- 2 files changed,

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit 9c66afe7720aa32a2640564bbf8b0af64e394ba5 Merge: e408aa3 089ee13 Author: Nick Mathewson Date: Mon Dec 7 10:11:21 2015 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-december2015 |4 + src/config/geoip | 4547