commit 04af1750b2a897f337d010ad737a9638c026fa8c Merge: 8115774 2270646 Author: Isis Lovecruft isis@torproject.org Date: Fri Aug 9 15:45:09 2013 +0000

Merge branch 'hotfix/5332-lib-gitignore'

.gitignore | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)