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
commit0c44446c4023141ab516d81fc244520bf8ee20fc (patch)
tree7429b7ece75440d208d7cc988b634ee49e32e8e2
parentd1340423faacb43884fc42d75e8ed8477fe5c7e1 (diff)
parentaf39c13a0385c9c61b3a7ffdd6362d2f86e3f44b (diff)
downloadtor-0c44446c4023141ab516d81fc244520bf8ee20fc.tar.gz
tor-0c44446c4023141ab516d81fc244520bf8ee20fc.zip
Merge branch 'maint-0.2.5' into release-0.2.5
-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}"