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

2017-08-01 Thread nickm
commit 6862eada65a6f41304b32c3d4fca3da9c240d5bd Merge: f794b40ec 0bfd1c318 Author: Nick Mathewson Date: Tue Aug 1 11:19:29 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/geoip-july2017 | 4 + src/config/geoip | 10075

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

2017-07-26 Thread nickm
commit f794b40ec0056ae8642d995b3cbce04441ebe26e Merge: 0ad5a6b03 af39c13a0 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

2017-07-26 Thread nickm
commit 0ad5a6b034df39df8cc390ee32042d4cb0683b93 Merge: 715185477 09618bc48 Author: Nick Mathewson Date: Wed Jul 26 15:34:56 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 .travis.yml | 88

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

2017-07-07 Thread nickm
commit 715185477d135d87f8ebf6fb12804cb2db5856bb Merge: f6420bc 78dfa76 Author: Nick Mathewson Date: Fri Jul 7 10:51:28 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug22789 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

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

2017-07-05 Thread nickm
commit f6420bceec9707324fe23c98a2a70dd2612f183f Merge: 3de2761 ff8c230 Author: Nick Mathewson Date: Wed Jul 5 13:42:32 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug22789 | 6 ++ src/common/compat.c | 8 ++-- src/test/test_addr.c | 9

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

2017-06-27 Thread nickm
commit 3de27618e65affe3688a5d92bce96e1e4ed5a82a Merge: 3913f95 ccae991 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

2017-06-09 Thread nickm
commit 3913f959e3688cfa91f9fab5368ba149e00cfec6 Merge: eb92d11 325c507 Author: Nick Mathewson Date: Fri Jun 9 09:58:45 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/geoip-june2017 |4 + src/config/geoip | 5079

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

2017-06-08 Thread nickm
commit eb92d11f53dd2245f4cfd618bde3996e76b498cf Merge: 95a88f7 1a7af74 Author: Nick Mathewson Date: Thu Jun 8 14:05:59 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 "ours" merge to avoid version bump.

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

2017-06-08 Thread nickm
commit b796ad0300d1b023bc38e5a1498b47bc2e680eae Merge: 0de4620 77c5d8c Author: Nick Mathewson Date: Thu Jun 8 09:28:29 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 "ours" merge to avoid version bump.

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

2017-06-08 Thread nickm
commit 40bccc20042fcc4f43964b358257470830169e73 Merge: a56cfda dec7998 Author: Nick Mathewson Date: Thu Jun 8 09:21:15 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 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.5' into maint-0.2.6

2017-06-05 Thread nickm
commit a56cfdaba20683562e5793d6bded58a591afb04c Merge: 9ea3d08 2e5220c Author: Nick Mathewson Date: Mon Jun 5 14:39:06 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 Ours merge to avoid taking 4ee48cb434c46d9e4c477dabd8a97f03e3db221d

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

2017-06-05 Thread nickm
commit 9ea3d0877a5be2762cfcb4d7c2015e5ec43a2055 Merge: 159ddf6 1a540b5 Author: Nick Mathewson Date: Mon Jun 5 12:00:27 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 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.5' into maint-0.2.6

2017-05-08 Thread nickm
commit 159ddf6ddedcad2bfc277a36fbde4aeb573be4cf Merge: 21d7767 68d6720 Author: Nick Mathewson Date: Mon May 8 08:07:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/geoip-may2017 |4 + src/config/geoip | 5862

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

2017-04-06 Thread nickm
commit 21d776738c2abf6ee0527439f7b96d35942c129c Merge: ecc73c3 a8a860e Author: Nick Mathewson Date: Thu Apr 6 08:31:18 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/geoip-april2017 | 4 + src/config/geoip| 14366

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

2017-03-08 Thread nickm
commit ecc73c3c035abe1a2c33e924e37e55064e712d56 Merge: 57e778f 933a1e7 Author: Nick Mathewson Date: Wed Mar 8 10:10:44 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/geoip-march2017 | 4 + src/config/geoip| 13115

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

2017-02-28 Thread nickm
commit ccdf0b319cf83bb7dde3b3c18044ee5ea99a60ac Merge: f7ed4a7 884b371 Author: Nick Mathewson Date: Tue Feb 28 10:25:51 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 "ours" merge to avoid version bumps