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
commitc47ab7863c6075b079dee3fb72c41d6892835d2c (patch)
tree6884d11599c3c19789dc90f9f9684d294f508814
parent2e9fbab843db2f3cdf1dad9207cdff7933d2d07c (diff)
parentf794b40ec0056ae8642d995b3cbce04441ebe26e (diff)
downloadtor-c47ab7863c6075b079dee3fb72c41d6892835d2c.tar.gz
tor-c47ab7863c6075b079dee3fb72c41d6892835d2c.zip
Merge branch 'maint-0.2.6' into release-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}"