diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-16 11:20:59 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-16 11:20:59 -0500 |
| commit | 2cee38f76a46860e2fb29fbd95ba36b332aa38c6 (patch) | |
| tree | 3b2cbaeff1472c8d23c18f3e88bc4735bbb22bcc /src/or/include.am | |
| parent | b310929ee36f0a88389dca53124506115c850c3b (diff) | |
| parent | 20292ec4974b777d430e7962cc38349c5f82b220 (diff) | |
| download | tor-2cee38f76a46860e2fb29fbd95ba36b332aa38c6.tar.gz tor-2cee38f76a46860e2fb29fbd95ba36b332aa38c6.zip | |
Merge branch 'prop271_030_v1_squashed'
Diffstat (limited to 'src/or/include.am')
| -rw-r--r-- | src/or/include.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/include.am b/src/or/include.am index c0ab0bc3e1..4e54deca55 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -19,6 +19,7 @@ EXTRA_DIST+= src/or/ntmain.c src/or/Makefile.nmake LIBTOR_A_SOURCES = \ src/or/addressmap.c \ + src/or/bridges.c \ src/or/buffers.c \ src/or/channel.c \ src/or/channeltls.c \ @@ -133,6 +134,7 @@ endif ORHEADERS = \ src/or/addressmap.h \ + src/or/bridges.h \ src/or/buffers.h \ src/or/channel.h \ src/or/channeltls.h \ |