commit fbd8121449ddefb6daa4910c6779c781d07c3390 Merge: 300bc11 5607297 Author: Isis Lovecruft isis@torproject.org Date: Mon Jul 20 19:56:51 2015 +0000

Merge branch 'hotfix/0.3.2-remove-lib-dir' into develop

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