commit f1ca6d350d8eaa350d976937ab40a335c965de3a Merge: ad53c64 8038eb9 Author: Sukhbir Singh sukhbir@torproject.org Date: Sun May 31 03:31:36 2015 -0400

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

projects/ctypes-otr/build | 4 ++++ 1 file changed, 4 insertions(+)