aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-03-26 20:13:49 -0400
committerNick Mathewson <nickm@torproject.org>2019-03-26 20:13:49 -0400
commita47b61f329fbe06b7b4935cf9c1923d96a74b649 (patch)
tree283c23aa4230a26fe9b40b1001cb05a457995b4d /.gitignore
parent57999e330b82fa3a360406dfb28b7a35fb50d602 (diff)
parent3767eff9bb712bccc86718647c7dc84998a7f95f (diff)
downloadtor-a47b61f329fbe06b7b4935cf9c1923d96a74b649.tar.gz
tor-a47b61f329fbe06b7b4935cf9c1923d96a74b649.zip
Merge branch 'messaging_v3' into messaging_v3_merged
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index a40cda02dd..0865f981b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -168,6 +168,8 @@ uptime-*.json
/src/lib/libtor-crypt-ops-testing.a
/src/lib/libtor-ctime.a
/src/lib/libtor-ctime-testing.a
+/src/lib/libtor-dispatch.a
+/src/lib/libtor-dispatch-testing.a
/src/lib/libtor-encoding.a
/src/lib/libtor-encoding-testing.a
/src/lib/libtor-evloop.a
@@ -200,6 +202,8 @@ uptime-*.json
/src/lib/libtor-osinfo-testing.a
/src/lib/libtor-process.a
/src/lib/libtor-process-testing.a
+/src/lib/libtor-pubsub.a
+/src/lib/libtor-pubsub-testing.a
/src/lib/libtor-sandbox.a
/src/lib/libtor-sandbox-testing.a
/src/lib/libtor-string.a