Merge remote-tracking branch 'origin/maint-0.2.5'

This commit is contained in:
Nick Mathewson
2014-09-08 15:08:51 -04:00
+2
View File
@@ -23,6 +23,8 @@
# Python droppings
*.pyc
*.pyo
# Cscope
cscope.*
# /
/Makefile