diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-23 01:23:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-23 01:23:53 -0400 |
| commit | 2527acb2dc8b71515ac0c882e3af4fc034ab1b48 (patch) | |
| tree | 48bdb4a6919a11fdb337969bb46353701895ad54 /src/common/Makefile.am | |
| parent | cb7fff193e2749f241e646b155de3ee33623606e (diff) | |
| parent | b80a8bba199b9adfb9c893641ba770566fa548e1 (diff) | |
| download | tor-2527acb2dc8b71515ac0c882e3af4fc034ab1b48.tar.gz tor-2527acb2dc8b71515ac0c882e3af4fc034ab1b48.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/common/Makefile.am
src/or/control.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 3a80eb80d4..48218491b5 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -19,6 +19,7 @@ libor_a_SOURCES = \ log.c \ memarea.c \ mempool.c \ + procmon.c \ util.c \ util_codedigest.c \ $(libor_extra_source) @@ -43,6 +44,7 @@ noinst_HEADERS = \ ht.h \ memarea.h \ mempool.h \ + procmon.h \ strlcat.c \ strlcpy.c \ torgzip.h \ |