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

2017-08-01 Thread nickm
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/release-0.2.7-redux] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-07-26 Thread nickm
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/release-0.2.7-redux] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-07-26 Thread nickm
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/release-0.2.7-redux] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-07-07 Thread nickm
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/release-0.2.7-redux] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-07-05 Thread nickm
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/release-0.2.7-redux] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-06-27 Thread nickm
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/release-0.2.7-redux] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-06-09 Thread nickm
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/release-0.2.7-redux] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-06-08 Thread nickm
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/release-0.2.7-redux] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-06-08 Thread nickm
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/release-0.2.7-redux] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-06-08 Thread nickm
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/release-0.2.7-redux] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-06-05 Thread nickm
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/release-0.2.7-redux] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-06-05 Thread nickm
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/release-0.2.7-redux] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-05-08 Thread nickm
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/release-0.2.7-redux] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-04-06 Thread nickm
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/release-0.2.7-redux] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-03-08 Thread nickm
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/release-0.2.7-redux] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-02-28 Thread nickm
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