[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.4' into maint-0.2.5

2017-08-01 Thread nickm
commit 0bfd1c318cdd468d2699714a36687e9cda16fabb Merge: af39c13a0 6199e27a2 Author: Nick Mathewson Date: Tue Aug 1 11:19:28 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-july2017 | 4 + src/config/geoip | 10075

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.4' into maint-0.2.5

2017-07-26 Thread nickm
commit af39c13a0385c9c61b3a7ffdd6362d2f86e3f44b Merge: 09618bc48 ebb441ded Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.4' into maint-0.2.5

2017-07-26 Thread nickm
commit 09618bc48884255d6d3dbc8b156fe025817d9402 Merge: 78dfa76dd 6d0af8dac Author: Nick Mathewson Date: Wed Jul 26 15:34:40 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 .travis.yml | 88

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.4' into maint-0.2.5

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

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.4' into maint-0.2.5

2017-07-05 Thread nickm
commit ff8c230d7cadb6c24dcf9c121521cff976fc83a5 Merge: ccae991 0ee15c9 Author: Nick Mathewson Date: Wed Jul 5 13:42:26 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug22789 | 6 ++ src/common/compat.c | 8 ++-- src/test/test_addr.c | 9

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.4' into maint-0.2.5

2017-06-27 Thread nickm
commit ccae991662adb3b64bdb1dcd4a942e4d1e163414 Merge: 325c507 d56f699 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.4' into maint-0.2.5

2017-06-09 Thread nickm
commit 325c507a090589ada4f0a781a313214c7cfd33a0 Merge: 1a7af74 104e8fa Author: Nick Mathewson Date: Fri Jun 9 09:58:45 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-june2017 |4 + src/config/geoip | 5079

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.4' into maint-0.2.5

2017-06-08 Thread nickm
commit 1a7af7470fdd6173f1b876fc6fee2b171174b4ff Merge: f3804f5 ec3ce77 Author: Nick Mathewson Date: Thu Jun 8 14:05:37 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 "ours" merge to avoid version bump.

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.4' into maint-0.2.5

2017-06-08 Thread nickm
commit 77c5d8c73856da7f07508fc263685717bd88dbc7 Merge: fa73f59 8e439a6 Author: Nick Mathewson Date: Thu Jun 8 09:28:11 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 "ours" merge to avoid version bump.

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.4' into maint-0.2.5

2017-06-08 Thread nickm
commit dec7998f5c42dde955760efc72f57025a32da238 Merge: 2e5220c 56a7c5b Author: Nick Mathewson Date: Thu Jun 8 09:21:15 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/trove-2017-005 | 7 +++ src/or/relay.c | 3 ++- 2 files changed, 9

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.4' into maint-0.2.5

2017-06-05 Thread nickm
commit 2e5220cb8b34b614fa10102899841247e906fb7b Merge: 1a540b5 4ee48cb Author: Nick Mathewson Date: Mon Jun 5 14:38:54 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 src/or/geoip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.4' into maint-0.2.5

2017-06-05 Thread nickm
commit 1a540b579248c04eba79c3e18d022054b238f6f5 Merge: 68d6720 e3ebae4 Author: Nick Mathewson Date: Mon Jun 5 12:00:08 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug22490 | 3 +++ src/or/geoip.c | 2 +- 2 files changed, 4 insertions(+), 1

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.4' into maint-0.2.5

2017-05-08 Thread nickm
commit 68d6720452fda2ffbc1a484672aa6d09c99f1d41 Merge: a8a860e 5207e41 Author: Nick Mathewson Date: Mon May 8 08:06:59 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-may2017 |4 + src/config/geoip | 5862

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.4' into maint-0.2.5

2017-04-06 Thread nickm
commit a8a860e1dac94e2194b4d073ee3245978121bbe8 Merge: 933a1e7 9d79332 Author: Nick Mathewson Date: Thu Apr 6 08:31:12 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-april2017 | 4 + src/config/geoip| 14366

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.4' into maint-0.2.5

2017-03-09 Thread nickm
commit 933a1e79975226c357d9d7f32be479a4868bb8d7 Merge: 884b371 4488c31 Author: Nick Mathewson Date: Wed Mar 8 10:10:29 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-march2017 | 4 + src/config/geoip| 13115

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.4' into maint-0.2.5

2017-02-28 Thread nickm
commit b2b604ecb4df95526a309c9ff507dff942472daa Merge: aeb299b 4bab288 Author: Nick Mathewson Date: Tue Feb 28 10:22:36 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 "ours" merge to avoid bumping version