commit a521c427883697fcfa027ffd72bb38f3aee5aceb
Merge: cbce8dedd 4e262196a
Author: Nick Mathewson
Date: Fri May 17 08:10:15 2019 -0400
Merge branch 'maint-0.2.9' into maint-0.3.4
changes/geoip-2019-05-13 | 4 +
src/config/geoip | 15407
commit 4d504bf098069538984690de7966a907180c7efe
Merge: 48e990359 ec213ae8a
Author: teor
Date: Fri Apr 19 11:39:17 2019 +1000
Merge branch 'maint-0.2.9' into maint-0.3.4
"ours" merge, to avoid taking any changes from PR 772 in 0.3.4.
(We already merged a different fix for 23790
commit cbce8dedd3703424111928d68dfe8920900ce054
Merge: 116970dda 2460b4461
Author: teor
Date: Fri Apr 19 11:59:18 2019 +1000
Merge branch 'maint-0.2.9' into maint-0.3.4
"ours" merge, to avoid taking any changes from PR 792 in 0.3.4.
(We already merged PR 791 for 29665 into
commit 48e990359b05661f2dd0ae503143ee9b18442475
Merge: 102178e6d a0db5ade3
Author: teor
Date: Sat Apr 6 09:33:11 2019 +1000
Merge branch 'maint-0.2.9' into maint-0.3.4
changes/bug30021| 8
src/common/tortls.c | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
commit 3cfcfbac46d15f7d1cc47da03482aa70583aa455
Merge: 74775b2df 54e249e26
Author: Nick Mathewson
Date: Wed Apr 3 09:27:42 2019 -0400
Merge branch 'maint-0.2.9' into maint-0.3.4
changes/geoip-2019-04-02 | 4 +
src/config/geoip | 10355
commit 74775b2dfd1a30abf75f2989195ec6c1bbe95fc0
Merge: 6d057c56f f7688cb17
Author: teor
Date: Tue Apr 2 11:45:13 2019 +1000
Merge branch 'maint-0.2.9' into maint-0.3.4
changes/bug29703 | 4
1 file changed, 4 insertions(+)
___
commit d7a5fdcb7408536008e8142becc323148e901da5
Merge: aec6ee201 db2ac3b9f
Author: teor
Date: Wed Mar 20 09:47:55 2019 +1000
Merge branch 'maint-0.2.9' into maint-0.3.4
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit e021f89f3636d197058dddea4383632bdf466ff0
Merge: f3b17a6b2 8bd9b2a6a
Author: teor
Date: Thu Mar 14 06:56:38 2019 +1000
Merge branch 'maint-0.2.9' into maint-0.3.4
changes/bug25733 | 4
1 file changed, 4 insertions(+)
___
