diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-10-07 16:05:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-10-07 16:05:13 -0400 |
| commit | ed39621a9d97dc07063b6e9052b52a91b99d82d6 (patch) | |
| tree | 56c4e4aa1f00f4b53a0ef1ac2c8e06d1da4ff376 /src/or/Makefile.am | |
| parent | 98e5c63eb254cb4b744281b75093c4bd7f73b6c6 (diff) | |
| parent | 1174bb95ce79767cfaee4f50ce70f42e7eb01b2e (diff) | |
| download | tor-ed39621a9d97dc07063b6e9052b52a91b99d82d6.tar.gz tor-ed39621a9d97dc07063b6e9052b52a91b99d82d6.zip | |
Merge remote-tracking branch 'asn2/bug3656'
Conflicts:
src/common/util.c
src/common/util.h
src/or/config.h
src/or/main.c
src/test/test_util.c
Diffstat (limited to 'src/or/Makefile.am')
| -rw-r--r-- | src/or/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/Makefile.am b/src/or/Makefile.am index e2a1b6d649..67adf504df 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -39,6 +39,7 @@ libtor_a_SOURCES = \ networkstatus.c \ nodelist.c \ onion.c \ + transports.c \ policies.c \ reasons.c \ relay.c \ @@ -104,6 +105,7 @@ noinst_HEADERS = \ ntmain.h \ onion.h \ or.h \ + transports.h \ policies.h \ reasons.h \ relay.h \ |