diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-12 11:47:25 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-12 11:47:25 -0400 |
| commit | 7556933537b5777a9bef21230bb91a08aa70d60e (patch) | |
| tree | a23d84b861cd801d1c805804efc3cd1881252582 /src/trunnel/include.am | |
| parent | 0317eb143ec6869e5a27c1ffc6d3d89be4c35c32 (diff) | |
| parent | ba3121191b59ea254e3ebab697430bdc03857b6d (diff) | |
| download | tor-7556933537b5777a9bef21230bb91a08aa70d60e.tar.gz tor-7556933537b5777a9bef21230bb91a08aa70d60e.zip | |
Merge branch 'socks_trunnel4_squashed' into socks_trunnel4_squashed_merged
Diffstat (limited to 'src/trunnel/include.am')
| -rw-r--r-- | src/trunnel/include.am | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/trunnel/include.am b/src/trunnel/include.am index 5a0a79c3a0..03c1753e96 100644 --- a/src/trunnel/include.am +++ b/src/trunnel/include.am @@ -10,7 +10,8 @@ TRUNNELINPUTS = \ src/trunnel/ed25519_cert.trunnel \ src/trunnel/link_handshake.trunnel \ src/trunnel/pwbox.trunnel \ - src/trunnel/channelpadding_negotiation.trunnel + src/trunnel/channelpadding_negotiation.trunnel \ + src/trunner/socks5.trunnel TRUNNELSOURCES = \ src/ext/trunnel/trunnel.c \ @@ -21,7 +22,8 @@ TRUNNELSOURCES = \ src/trunnel/hs/cell_establish_intro.c \ src/trunnel/hs/cell_introduce1.c \ src/trunnel/hs/cell_rendezvous.c \ - src/trunnel/channelpadding_negotiation.c + src/trunnel/channelpadding_negotiation.c \ + src/trunnel/socks5.c TRUNNELHEADERS = \ src/ext/trunnel/trunnel.h \ @@ -34,7 +36,8 @@ TRUNNELHEADERS = \ src/trunnel/hs/cell_establish_intro.h \ src/trunnel/hs/cell_introduce1.h \ src/trunnel/hs/cell_rendezvous.h \ - src/trunnel/channelpadding_negotiation.h + src/trunnel/channelpadding_negotiation.h \ + src/trunnel/socks5.h src_trunnel_libor_trunnel_a_SOURCES = $(TRUNNELSOURCES) src_trunnel_libor_trunnel_a_CPPFLAGS = \ |