subject:"\[tor\-commits\] \[tor\/maint\-0.3.3\] Merge branch 'maint\-0.2.5' into maint\-0.2.9"

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.2.5' into maint-0.2.9

2018-04-05 Thread nickm

commit b68e636b3368feb48444fd2f652ca279ddb73946 Merge: 4bb7d9fd1 1fa396b0a Author: Nick Mathewson Date: Thu Apr 5 08:22:33 2018 -0400 Merge branch 'maint-0.2.5' into maint-0.2.9 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.2.5' into maint-0.2.9

2018-03-19 Thread nickm

commit 3370b3cfef62cba8377285d95b232f810edde504 Merge: 67a313f0e 0eb2cdf99 Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.2.5' into maint-0.2.9 .travis.yml | 24 1 file changed, 20 insertions(+), 4

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.2.5' into maint-0.2.9

2018-03-13 Thread nickm

commit 67a313f0ecc281dd73004eaa810b17e3cdcc3a24 Merge: 9eb6f9d3c 3418a3a7f Author: Nick Mathewson Date: Tue Mar 13 10:58:02 2018 -0400 Merge branch 'maint-0.2.5' into maint-0.2.9 changes/geoip-2018-03-08 | 4 + src/config/geoip | 36382