[tor-commits] [webwml/master] Note Arturo's new key

2017-07-26 Thread atagar
commit 344668e3cb83a2e33c16533687f0f4474ad55c03 Author: Damian Johnson Date: Wed Jul 26 20:53:56 2017 -0700 Note Arturo's new key https://trac.torproject.org/projects/tor/ticket/22957 --- about/en/corepeople.wml | 1 + 1 file changed, 1 insertion(+) diff --git a/about/en/corepeop

[tor-commits] [webwml/master] Add Andreas

2017-07-26 Thread atagar
commit ab942162e6a245712cf3bf2721858e295597c0ac Author: Damian Johnson Date: Wed Jul 26 21:03:36 2017 -0700 Add Andreas --- about/en/corepeople.wml | 140 keys/andreas.txt| 931 2 files changed, 1007 insertions(+), 64 deleti

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2017-07-26 Thread translation
commit 9c3759e2e565ec66ec2c40a30c94f1b9c378acf0 Author: Translation commit bot Date: Wed Jul 26 22:19:31 2017 + Update translations for tor-browser-manual --- da/da.po | 3 +++ 1 file changed, 3 insertions(+) diff --git a/da/da.po b/da/da.po index f15022a87..bf7da961a 100644 --- a/da/

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

2017-07-26 Thread nickm
commit a2d70331954aed82b08419191c200e3630be2305 Merge: 4557f3f90 1c5a76f0c Author: Nick Mathewson Date: Wed Jul 26 15:39:56 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-07-26 Thread nickm
commit 1c5a76f0ceeb0e704a52e1f0fd421790b90bebe6 Merge: ebb0ac338 7021d33b9 Author: Nick Mathewson Date: Wed Jul 26 15:39:56 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-07-26 Thread nickm
commit 7021d33b91a3fe4a4d90ad660db4bba5642769f7 Merge: cc4c1840a f17f7a4fd Author: Nick Mathewson Date: Wed Jul 26 15:39:56 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _

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

2017-07-26 Thread nickm
commit 5c5eb0f095c2744e8717f613a6edcc8d118f163a Merge: fbf93614c ddd66cc01 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___

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

2017-07-26 Thread nickm
commit f17f7a4fdf1037a2cabe7c766231da244e30e692 Merge: f226d6460 5c5eb0f09 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

2017-07-26 Thread nickm
commit f794b40ec0056ae8642d995b3cbce04441ebe26e Merge: 0ad5a6b03 af39c13a0 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 .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

2017-07-26 Thread nickm
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.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/release-0.2.9] Point travis to #tor-ci, not #tor-bots

2017-07-26 Thread nickm
commit ebb441ded25420bad941d970ef650552d6cc2f9c Author: Nick Mathewson Date: Wed Jul 26 15:39:50 2017 -0400 Point travis to #tor-ci, not #tor-bots --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa0337b49..59b32dbe4 100644

[tor-commits] [tor/release-0.3.1] 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/release-0.3.0] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-07-26 Thread nickm
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.0] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-07-26 Thread nickm
commit f17f7a4fdf1037a2cabe7c766231da244e30e692 Merge: f226d6460 5c5eb0f09 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

2017-07-26 Thread nickm
commit ef1d93975163a64298ef7f662dbd8dd0551c992c Merge: df58a97f4 7021d33b9 Author: Nick Mathewson Date: Wed Jul 26 15:39:56 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _

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

2017-07-26 Thread nickm
commit 5c5eb0f095c2744e8717f613a6edcc8d118f163a Merge: fbf93614c ddd66cc01 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___

[tor-commits] [tor/release-0.2.9] 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/release-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

2017-07-26 Thread nickm
commit 5c5eb0f095c2744e8717f613a6edcc8d118f163a Merge: fbf93614c ddd66cc01 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___

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

2017-07-26 Thread nickm
commit f794b40ec0056ae8642d995b3cbce04441ebe26e Merge: 0ad5a6b03 af39c13a0 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _

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

2017-07-26 Thread nickm
commit a76315be598878c8e76e5de651c3dc01aefb14c9 Merge: 4d157075f f17f7a4fd Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _

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

2017-07-26 Thread nickm
commit f794b40ec0056ae8642d995b3cbce04441ebe26e Merge: 0ad5a6b03 af39c13a0 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _

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

2017-07-26 Thread nickm
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] Point travis to #tor-ci, not #tor-bots

2017-07-26 Thread nickm
commit ebb441ded25420bad941d970ef650552d6cc2f9c Author: Nick Mathewson Date: Wed Jul 26 15:39:50 2017 -0400 Point travis to #tor-ci, not #tor-bots --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa0337b49..59b32dbe4 100644

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

2017-07-26 Thread nickm
commit 5c5eb0f095c2744e8717f613a6edcc8d118f163a Merge: fbf93614c ddd66cc01 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___

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

2017-07-26 Thread nickm
commit 7021d33b91a3fe4a4d90ad660db4bba5642769f7 Merge: cc4c1840a f17f7a4fd Author: Nick Mathewson Date: Wed Jul 26 15:39:56 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _

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

2017-07-26 Thread nickm
commit f17f7a4fdf1037a2cabe7c766231da244e30e692 Merge: f226d6460 5c5eb0f09 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

2017-07-26 Thread nickm
commit 6d3b808198b2281a470bd85df5e16d07bf88fcbc Merge: 1ee8ed4b6 5c5eb0f09 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _

[tor-commits] [tor/release-0.2.4] Point travis to #tor-ci, not #tor-bots

2017-07-26 Thread nickm
commit ebb441ded25420bad941d970ef650552d6cc2f9c Author: Nick Mathewson Date: Wed Jul 26 15:39:50 2017 -0400 Point travis to #tor-ci, not #tor-bots --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa0337b49..59b32dbe4 100644

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

2017-07-26 Thread nickm
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.2.8] Merge branch 'maint-0.2.5' into maint-0.2.6

2017-07-26 Thread nickm
commit f794b40ec0056ae8642d995b3cbce04441ebe26e Merge: 0ad5a6b03 af39c13a0 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _

[tor-commits] [tor/release-0.3.0] Point travis to #tor-ci, not #tor-bots

2017-07-26 Thread nickm
commit ebb441ded25420bad941d970ef650552d6cc2f9c Author: Nick Mathewson Date: Wed Jul 26 15:39:50 2017 -0400 Point travis to #tor-ci, not #tor-bots --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa0337b49..59b32dbe4 100644

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

2017-07-26 Thread nickm
commit f17f7a4fdf1037a2cabe7c766231da244e30e692 Merge: f226d6460 5c5eb0f09 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/release-0.2.6] Point travis to #tor-ci, not #tor-bots

2017-07-26 Thread nickm
commit ebb441ded25420bad941d970ef650552d6cc2f9c Author: Nick Mathewson Date: Wed Jul 26 15:39:50 2017 -0400 Point travis to #tor-ci, not #tor-bots --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa0337b49..59b32dbe4 100644

[tor-commits] [tor/release-0.2.7-redux] 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/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

2017-07-26 Thread nickm
commit 0c6c4023141ab516d81fc244520bf8ee20fc Merge: d1340423f af39c13a0 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.5' into release-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.7-redux' into maint-0.2.8

2017-07-26 Thread nickm
commit 5c5eb0f095c2744e8717f613a6edcc8d118f163a Merge: fbf93614c ddd66cc01 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___

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

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

[tor-commits] [tor/release-0.2.5] 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/release-0.2.5] Point travis to #tor-ci, not #tor-bots

2017-07-26 Thread nickm
commit ebb441ded25420bad941d970ef650552d6cc2f9c Author: Nick Mathewson Date: Wed Jul 26 15:39:50 2017 -0400 Point travis to #tor-ci, not #tor-bots --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa0337b49..59b32dbe4 100644

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

2017-07-26 Thread nickm
commit f794b40ec0056ae8642d995b3cbce04441ebe26e Merge: 0ad5a6b03 af39c13a0 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _

[tor-commits] [tor/release-0.2.6] Merge branch 'maint-0.2.5' into maint-0.2.6

2017-07-26 Thread nickm
commit f794b40ec0056ae8642d995b3cbce04441ebe26e Merge: 0ad5a6b03 af39c13a0 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _

[tor-commits] [tor/release-0.2.8] Point travis to #tor-ci, not #tor-bots

2017-07-26 Thread nickm
commit ebb441ded25420bad941d970ef650552d6cc2f9c Author: Nick Mathewson Date: Wed Jul 26 15:39:50 2017 -0400 Point travis to #tor-ci, not #tor-bots --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa0337b49..59b32dbe4 100644

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-07-26 Thread nickm
commit 7021d33b91a3fe4a4d90ad660db4bba5642769f7 Merge: cc4c1840a f17f7a4fd Author: Nick Mathewson Date: Wed Jul 26 15:39:56 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _

[tor-commits] [tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-07-26 Thread nickm
commit 1c5a76f0ceeb0e704a52e1f0fd421790b90bebe6 Merge: ebb0ac338 7021d33b9 Author: Nick Mathewson Date: Wed Jul 26 15:39:56 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/master] 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/master] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-07-26 Thread nickm
commit f17f7a4fdf1037a2cabe7c766231da244e30e692 Merge: f226d6460 5c5eb0f09 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

2017-07-26 Thread nickm
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.2.7-redux] Point travis to #tor-ci, not #tor-bots

2017-07-26 Thread nickm
commit ebb441ded25420bad941d970ef650552d6cc2f9c Author: Nick Mathewson Date: Wed Jul 26 15:39:50 2017 -0400 Point travis to #tor-ci, not #tor-bots --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa0337b49..59b32dbe4 100644

[tor-commits] [tor/master] Point travis to #tor-ci, not #tor-bots

2017-07-26 Thread nickm
commit ebb441ded25420bad941d970ef650552d6cc2f9c Author: Nick Mathewson Date: Wed Jul 26 15:39:50 2017 -0400 Point travis to #tor-ci, not #tor-bots --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa0337b49..59b32dbe4 100644

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

2017-07-26 Thread nickm
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/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-07-26 Thread nickm
commit f17f7a4fdf1037a2cabe7c766231da244e30e692 Merge: f226d6460 5c5eb0f09 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

2017-07-26 Thread nickm
commit c47ab7863c6075b079dee3fb72c41d6892835d2c Merge: 2e9fbab84 f794b40ec Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.6' into release-0.2.6 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _

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

2017-07-26 Thread nickm
commit b45500c6c2d8bbd357ed324b7012f0de7d76fc0d Merge: e2ea9ad4d ddd66cc01 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.7-redux' into release-0.2.7-redux .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _

[tor-commits] [tor/release-0.2.8] 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/release-0.2.6] 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6

2017-07-26 Thread nickm
commit f794b40ec0056ae8642d995b3cbce04441ebe26e Merge: 0ad5a6b03 af39c13a0 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

2017-07-26 Thread nickm
commit 836d628fc5a8974be09e58c32d2bc178874d50c2 Merge: ca9834c5c 1c5a76f0c Author: Nick Mathewson Date: Wed Jul 26 15:39:56 2017 -0400 Merge branch 'maint-0.3.1' .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___ tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-07-26 Thread nickm
commit 7021d33b91a3fe4a4d90ad660db4bba5642769f7 Merge: cc4c1840a f17f7a4fd Author: Nick Mathewson Date: Wed Jul 26 15:39:56 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.6

2017-07-26 Thread nickm
commit f794b40ec0056ae8642d995b3cbce04441ebe26e Merge: 0ad5a6b03 af39c13a0 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _

[tor-commits] [tor/maint-0.3.1] Point travis to #tor-ci, not #tor-bots

2017-07-26 Thread nickm
commit ebb441ded25420bad941d970ef650552d6cc2f9c Author: Nick Mathewson Date: Wed Jul 26 15:39:50 2017 -0400 Point travis to #tor-ci, not #tor-bots --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa0337b49..59b32dbe4 100644

[tor-commits] [tor/master] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

2017-07-26 Thread nickm
commit 5c5eb0f095c2744e8717f613a6edcc8d118f163a Merge: fbf93614c ddd66cc01 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___

[tor-commits] [tor/maint-0.3.1] 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.1] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-07-26 Thread nickm
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/maint-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-07-26 Thread nickm
commit 7021d33b91a3fe4a4d90ad660db4bba5642769f7 Merge: cc4c1840a f17f7a4fd Author: Nick Mathewson Date: Wed Jul 26 15:39:56 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___

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

2017-07-26 Thread nickm
commit 5c5eb0f095c2744e8717f613a6edcc8d118f163a Merge: fbf93614c ddd66cc01 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___

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

2017-07-26 Thread nickm
commit 1c5a76f0ceeb0e704a52e1f0fd421790b90bebe6 Merge: ebb0ac338 7021d33b9 Author: Nick Mathewson Date: Wed Jul 26 15:39:56 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___

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

2017-07-26 Thread nickm
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/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.2.9] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-07-26 Thread nickm
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/maint-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.6

2017-07-26 Thread nickm
commit f794b40ec0056ae8642d995b3cbce04441ebe26e Merge: 0ad5a6b03 af39c13a0 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _

[tor-commits] [tor/maint-0.3.0] Point travis to #tor-ci, not #tor-bots

2017-07-26 Thread nickm
commit ebb441ded25420bad941d970ef650552d6cc2f9c Author: Nick Mathewson Date: Wed Jul 26 15:39:50 2017 -0400 Point travis to #tor-ci, not #tor-bots --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa0337b49..59b32dbe4 100644

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

2017-07-26 Thread nickm
commit f794b40ec0056ae8642d995b3cbce04441ebe26e Merge: 0ad5a6b03 af39c13a0 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _

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

2017-07-26 Thread nickm
commit f794b40ec0056ae8642d995b3cbce04441ebe26e Merge: 0ad5a6b03 af39c13a0 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _

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

2017-07-26 Thread nickm
commit 5c5eb0f095c2744e8717f613a6edcc8d118f163a Merge: fbf93614c ddd66cc01 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _

[tor-commits] [tor/maint-0.2.9] Point travis to #tor-ci, not #tor-bots

2017-07-26 Thread nickm
commit ebb441ded25420bad941d970ef650552d6cc2f9c Author: Nick Mathewson Date: Wed Jul 26 15:39:50 2017 -0400 Point travis to #tor-ci, not #tor-bots --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa0337b49..59b32dbe4 100644

[tor-commits] [tor/maint-0.2.7-redux] Point travis to #tor-ci, not #tor-bots

2017-07-26 Thread nickm
commit ebb441ded25420bad941d970ef650552d6cc2f9c Author: Nick Mathewson Date: Wed Jul 26 15:39:50 2017 -0400 Point travis to #tor-ci, not #tor-bots --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa0337b49..59b32dbe4 100644

[tor-commits] [tor/maint-0.2.9] 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.2.7-redux] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-07-26 Thread nickm
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/maint-0.2.7-redux] Merge branch 'maint-0.2.5' into maint-0.2.6

2017-07-26 Thread nickm
commit f794b40ec0056ae8642d995b3cbce04441ebe26e Merge: 0ad5a6b03 af39c13a0 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _

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

2017-07-26 Thread nickm
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/maint-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-07-26 Thread nickm
commit f17f7a4fdf1037a2cabe7c766231da244e30e692 Merge: f226d6460 5c5eb0f09 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___

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

2017-07-26 Thread nickm
commit f794b40ec0056ae8642d995b3cbce04441ebe26e Merge: 0ad5a6b03 af39c13a0 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___

[tor-commits] [tor/maint-0.2.7-redux] 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.2.5] Point travis to #tor-ci, not #tor-bots

2017-07-26 Thread nickm
commit ebb441ded25420bad941d970ef650552d6cc2f9c Author: Nick Mathewson Date: Wed Jul 26 15:39:50 2017 -0400 Point travis to #tor-ci, not #tor-bots --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa0337b49..59b32dbe4 100644

[tor-commits] [tor/maint-0.2.6] 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.2.8] 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.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

2017-07-26 Thread nickm
commit 5c5eb0f095c2744e8717f613a6edcc8d118f163a Merge: fbf93614c ddd66cc01 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___

[tor-commits] [tor/maint-0.2.8] Point travis to #tor-ci, not #tor-bots

2017-07-26 Thread nickm
commit ebb441ded25420bad941d970ef650552d6cc2f9c Author: Nick Mathewson Date: Wed Jul 26 15:39:50 2017 -0400 Point travis to #tor-ci, not #tor-bots --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa0337b49..59b32dbe4 100644

[tor-commits] [tor/maint-0.2.6] Point travis to #tor-ci, not #tor-bots

2017-07-26 Thread nickm
commit ebb441ded25420bad941d970ef650552d6cc2f9c Author: Nick Mathewson Date: Wed Jul 26 15:39:50 2017 -0400 Point travis to #tor-ci, not #tor-bots --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa0337b49..59b32dbe4 100644

[tor-commits] [tor/maint-0.2.5] 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/release-0.3.1] Merge remote-tracking branch 'isis/bug22636_0.3.1_squashed' into maint-0.3.1

2017-07-26 Thread nickm
commit ebb0ac3385d80c545f049442b1db6a84ff581aad Merge: 1a907c659 810bbb791 Author: Nick Mathewson Date: Wed Jul 26 15:38:23 2017 -0400 Merge remote-tracking branch 'isis/bug22636_0.3.1_squashed' into maint-0.3.1 .travis.yml | 99 +++

[tor-commits] [tor/maint-0.2.4] Point travis to #tor-ci, not #tor-bots

2017-07-26 Thread nickm
commit ebb441ded25420bad941d970ef650552d6cc2f9c Author: Nick Mathewson Date: Wed Jul 26 15:39:50 2017 -0400 Point travis to #tor-ci, not #tor-bots --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa0337b49..59b32dbe4 100644

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-07-26 Thread nickm
commit cc4c1840a6a7fe6e5ff91ce391f6a920fabe0b86 Merge: 18734d3b2 f226d6460 Author: Nick Mathewson Date: Wed Jul 26 15:37:06 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 .travis.yml | 88 changes/bug22636 | 8 ++

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

2017-07-26 Thread nickm
commit 4557f3f9089633e1442d7e955421c65d1e26bcff Merge: 3ada086d3 ebb0ac338 Author: Nick Mathewson Date: Wed Jul 26 15:38:48 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 .travis.yml | 99 changes/bug22636 | 8 +

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

2017-07-26 Thread nickm
commit fbf93614c9d42ff6bcd7b1252ad9f9e6ba2f890c Merge: 48e45e2fb c362c6a85 Author: Nick Mathewson Date: Wed Jul 26 15:35:07 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 .travis.yml | 88 changes/bug22636 | 8 ++

[tor-commits] [tor/release-0.3.1] Travis update: "gcc-warnings" became "fatal-warnings" in 0.2.9

2017-07-26 Thread nickm
commit f226d6460d22e69ab00d8256cfc19e120305e581 Author: Nick Mathewson Date: Wed Jul 26 15:37:00 2017 -0400 Travis update: "gcc-warnings" became "fatal-warnings" in 0.2.9 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa0

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

2017-07-26 Thread nickm
commit dcc477cb53cda792c433b01c21f45cd4415c984d Merge: 0117e2ea0 fbf93614c Author: Nick Mathewson Date: Wed Jul 26 15:35:17 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 .travis.yml | 88 changes/bug22636 | 8 ++

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-07-26 Thread nickm
commit 1a907c659378b1748e65f8d94f7d212a91122247 Merge: 431c8d09e cc4c1840a Author: Nick Mathewson Date: Wed Jul 26 15:37:53 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 This is an "ours" merge to avoid taking any changs from maint-0.3.0: we don't want to take the trav

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

2017-07-26 Thread nickm
commit 0ad5a6b034df39df8cc390ee32042d4cb0683b93 Merge: 715185477 09618bc48 Author: Nick Mathewson Date: Wed Jul 26 15:34:56 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 .travis.yml | 88 changes/bug22636 | 8 ++

  1   2   3   4   >