tor

commit f794b40ec0056ae8642d995b3cbce04441ebe26e
parent 0ad5a6b034df39df8cc390ee32042d4cb0683b93
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 26 Jul 2017 15:39:55 -0400

Merge branch 'maint-0.2.5' into maint-0.2.6

Diffstat:
M
.travis.yml
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git 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}"