summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-07-26 15:39:55 -0400
committerNick Mathewson <nickm@torproject.org>2017-07-26 15:39:55 -0400
commit5c5eb0f095c2744e8717f613a6edcc8d118f163a (patch)
tree9ec06316ffc76acf805d88ee9c08cdb1c220059f
parentfbf93614c9d42ff6bcd7b1252ad9f9e6ba2f890c (diff)
parentddd66cc01911da301ef61813c951418996c19593 (diff)
downloadtor-5c5eb0f095c2744e8717f613a6edcc8d118f163a.tar.gz
tor-5c5eb0f095c2744e8717f613a6edcc8d118f163a.zip
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index fa0337b492..59b32dbe42 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ compiler:
notifications:
irc:
channels:
- - "irc.oftc.net#tor-bots"
+ - "irc.oftc.net#tor-ci"
template:
- "%{repository} %{branch} %{commit} - %{author}: %{commit_subject}"
- "Build #%{build_number} %{result}. Details: %{build_url}"