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 | 0834f4d93dc808bc2f01350635719551762fee69 (patch) | |
| tree | 80e65592095706c7471fa5609efc710b479ec554 | |
| parent | 4c015d9fe4abf54f5e3d8929fa62b916789e158f (diff) | |
| parent | ca8e9813bf125d68d64228d1bb39a170ae6ea16b (diff) | |
| download | tor-0834f4d93dc808bc2f01350635719551762fee69.tar.gz tor-0834f4d93dc808bc2f01350635719551762fee69.zip | |
Merge branch 'maint-0.3.2' into release-0.3.2
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 671288d418..4dc8867a89 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ .#* *~ *.swp +*.swo # C stuff *.o *.obj |