[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.7' into maint-0.2.8

2017-02-15 Thread nickm
commit 5222054163e0233dfc2cf59de779b2f816bfeb63 Merge: 71cd68b e6376a8 Author: Nick Mathewson Date: Wed Feb 15 07:52:47 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 ___ tor-commits mailing list

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.7' into maint-0.2.8

2017-02-15 Thread nickm
commit 1ebdae61711ec03ce49af2f356756b5db9587412 Merge: 9b90d51 ed80684 Author: Nick Mathewson Date: Wed Feb 15 07:47:28 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 changes/bug20384 | 10 ++ changes/trove-2017-001.2 | 8

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.7' into maint-0.2.8

2017-02-15 Thread nickm
commit 9ff76185d284f1982b5f49b2c652f7a05e71ba2b Merge: 9b90d51 5c42358 Author: Roger Dingledine Date: Mon Feb 13 15:39:13 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 ___ tor-commits mailing list

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.7' into maint-0.2.8

2017-02-13 Thread nickm
commit 9b90d515a9fc52c2579d55406e78de8d2fb5fa19 Merge: eca4a89 75fe218 Author: Nick Mathewson Date: Mon Feb 13 14:37:55 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 changes/geoip-february2017 | 4 + src/config/geoip | 10832

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.7' into maint-0.2.8

2017-02-07 Thread nickm
commit eca4a89319c566c0e320c7f713aed0f7e34330eb Merge: a9f936d 4bce207 Author: Nick Mathewson Date: Tue Feb 7 10:39:13 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 ___ tor-commits mailing list

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.7' into maint-0.2.8

2017-02-07 Thread nickm
commit a9f936d0d757c5628a8da0b88af4710b2f6d22fd Merge: b60fb3a 86d5a6f Author: Nick Mathewson Date: Tue Feb 7 09:30:10 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 ___ tor-commits mailing list

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.7' into maint-0.2.8

2017-02-07 Thread nickm
commit b60fb3ab8b803b535a81296dbbf7d0c218a3dd27 Merge: 93ea18e 0a43134 Author: Nick Mathewson Date: Tue Feb 7 09:20:45 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 ___ tor-commits mailing list

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.7' into maint-0.2.8

2017-02-07 Thread nickm
commit 93ea18e918813ec5e30ac7dc02fc4b545397396e Merge: 7b24f3e 115cefd Author: Nick Mathewson Date: Tue Feb 7 08:55:28 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 ___ tor-commits mailing list

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.7' into maint-0.2.8

2017-02-07 Thread nickm
commit 7b24f3e0fef04cdb21cd0b73ec4fde457702a81b Merge: c77ace6 eb72365 Author: Nick Mathewson Date: Tue Feb 7 08:39:33 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 ___ tor-commits mailing list

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.7' into maint-0.2.8

2017-01-11 Thread nickm
commit c77ace69bb7342522366a6ce2bdb51a26bf34f57 Merge: cb2e205 8c91cbb Author: Nick Mathewson Date: Wed Jan 11 09:13:15 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 changes/geoip-january2017 |4 + src/config/geoip | 3160

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.7' into maint-0.2.8

2016-12-20 Thread nickm
commit cb2e2056b5637443715bf494be72d0953c75b4be Merge: 7f55aaf 2673b4b Author: Nick Mathewson Date: Tue Dec 20 18:23:35 2016 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 ___ tor-commits mailing list

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.7' into maint-0.2.8

2016-12-20 Thread nickm
commit 7f55aaf281473089355c855c2632b2d1a9467ebb Merge: f62c74c a9c8a5f Author: Nick Mathewson Date: Tue Dec 20 18:15:26 2016 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 ___ tor-commits mailing list

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.7' into maint-0.2.8

2016-12-09 Thread nickm
commit 56a2b8dc6ea3d8438562d5eb7c3595aafd23c04d Merge: d47c52b b49369b Author: Nick Mathewson Date: Fri Dec 9 08:34:18 2016 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 changes/geoip-december2016 |4 + src/config/geoip | 6259

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.7' into maint-0.2.8

2016-11-07 Thread nickm
commit 2639fd08e7212bb33c0964b57028c013ce2271aa Merge: 61bdc45 f5fdf18 Author: Nick Mathewson Date: Mon Nov 7 09:31:36 2016 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 changes/geoip-november2016 |4 + src/config/geoip | 4025