diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-13 12:07:46 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-13 12:07:46 -0500 |
| commit | 9b714697739f3665c49c84e9a439285c75ad3bbc (patch) | |
| tree | 5f044577052d64fdef60ddcc8712c7e1d0bdebf8 | |
| parent | 1fb3d37c08be1c1e9501990d1762c0fbb1f9388d (diff) | |
| parent | ca8e9813bf125d68d64228d1bb39a170ae6ea16b (diff) | |
| download | tor-9b714697739f3665c49c84e9a439285c75ad3bbc.tar.gz tor-9b714697739f3665c49c84e9a439285c75ad3bbc.zip | |
Merge branch 'maint-0.3.2'
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index b8642ee76e..c00fbe97e1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ .#* *~ *.swp +*.swo # C stuff *.o *.obj |