[tor-commits] [torspec/master] Merge remote-tracking branch 'teor/gitignore-osx'

[nickm@xxxxxxxxxxxxxx]

commit 29435e0051967a3e4b0dfe8401fd1325b5f5ddf5
Merge: 3bac19d 2f13c58
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Oct 21 12:20:03 2015 -0400

    Merge remote-tracking branch 'teor/gitignore-osx'

 .gitignore |    2 ++
 1 file changed, 2 insertions(+)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits