diff options
| author | Andrea Shepard <andrea@persephoneslair.org> | 2012-10-10 18:53:38 -0700 |
|---|---|---|
| committer | Andrea Shepard <andrea@persephoneslair.org> | 2012-10-10 18:53:38 -0700 |
| commit | 8b36d4cc2ab95acd4c2c7203afb29a051a38c5c9 (patch) | |
| tree | 92eabec1394092735e8b6e47f664f0094b76e6be /src/or/include.am | |
| parent | ec97319464aab204740acb013b504abb0e13d989 (diff) | |
| parent | bd28322d3815a03ca04beb6d00052d613dbe226f (diff) | |
| download | tor-8b36d4cc2ab95acd4c2c7203afb29a051a38c5c9.tar.gz tor-8b36d4cc2ab95acd4c2c7203afb29a051a38c5c9.zip | |
Merge branch 'bug6816_squashed_nowarn' of git://git.torproject.org/nickm/tor
Diffstat (limited to 'src/or/include.am')
| -rw-r--r-- | src/or/include.am | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/or/include.am b/src/or/include.am index e9811ec962..90dea44ba8 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -17,8 +17,12 @@ endif src_or_libtor_a_SOURCES = \ src/or/buffers.c \ + src/or/channel.c \ + src/or/channeltls.c \ src/or/circuitbuild.c \ src/or/circuitlist.c \ + src/or/circuitmux.c \ + src/or/circuitmux_ewma.c \ src/or/circuituse.c \ src/or/command.c \ src/or/config.c \ @@ -86,8 +90,12 @@ src_or_tor_LDADD = src/or/libtor.a src/common/libor.a src/common/libor-crypto.a ORHEADERS = \ src/or/buffers.h \ + src/or/channel.h \ + src/or/channeltls.h \ src/or/circuitbuild.h \ src/or/circuitlist.h \ + src/or/circuitmux.h \ + src/or/circuitmux_ewma.h \ src/or/circuituse.h \ src/or/command.h \ src/or/config.h \ |