aboutsummaryrefslogtreecommitdiff
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
commitf794b40ec0056ae8642d995b3cbce04441ebe26e (patch)
treefa2912ff49e2008bfe3ef90013474bd97ad1bf55
parent0ad5a6b034df39df8cc390ee32042d4cb0683b93 (diff)
parentaf39c13a0385c9c61b3a7ffdd6362d2f86e3f44b (diff)
downloadtor-f794b40ec0056ae8642d995b3cbce04441ebe26e.tar.gz
tor-f794b40ec0056ae8642d995b3cbce04441ebe26e.zip
Merge branch 'maint-0.2.5' into maint-0.2.6
-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}"