commit 0f80dd2a26333ee78a9698b4d3cf8079736f34b5 Merge: fd34049 87134db Author: Nick Mathewson <nickm@torproject.org> Date: Mon May 23 11:06:22 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 .gitignore | 3 --- 1 file changed, 3 deletions(-)