diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-11 16:39:45 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-11 16:39:45 -0400 |
| commit | 9fba014e3f7f89520841b65b8b038e5fb931b1d6 (patch) | |
| tree | 2197904844e7ae25b4a2d6465c2aa0cca1798019 /src/common/Makefile.am | |
| parent | 6d5478a8a7734553fc84574e725625610f46dc8c (diff) | |
| parent | 8fb38331c3213caef2d2e003e02cdb361504f14f (diff) | |
| download | tor-9fba014e3f7f89520841b65b8b038e5fb931b1d6.tar.gz tor-9fba014e3f7f89520841b65b8b038e5fb931b1d6.zip | |
Merge remote-tracking branch 'public/bug3122_memcmp_022' into bug3122_memcmp_023
Conflicts in various places, mainly node-related. Resolved them in
favor of HEAD, with copying of tor_mem* operations from bug3122_memcmp_022.
src/common/Makefile.am
src/or/circuitlist.c
src/or/connection_edge.c
src/or/directory.c
src/or/microdesc.c
src/or/networkstatus.c
src/or/router.c
src/or/routerlist.c
src/test/test_util.c
Diffstat (limited to 'src/common/Makefile.am')
| -rw-r--r-- | src/common/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 20e3f5ae16..3a80eb80d4 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -15,6 +15,7 @@ libor_a_SOURCES = \ address.c \ compat.c \ container.c \ + di_ops.c \ log.c \ memarea.c \ mempool.c \ @@ -38,6 +39,7 @@ noinst_HEADERS = \ compat_libevent.h \ container.h \ crypto.h \ + di_ops.h \ ht.h \ memarea.h \ mempool.h \ |