[tor-commits] [tor-messenger-build/master] Merge branch 'master' of git-rw.torproject.org:tor-messenger-build

[sukhbir at torproject.org]

commit 697fc73538c74a8c756b736cc25f8bf59b045f7c
Merge: ac55154 8eadae0
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Tue Sep 1 12:03:32 2015 -0400

    Merge branch 'master' of git-rw.torproject.org:tor-messenger-build

 projects/docker-image/config |    6 ++++++
 1 file changed, 6 insertions(+)