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

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.3.1] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

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.3.1] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

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.3.1] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

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.3.1] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

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.3.1] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

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