diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-21 16:28:32 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-21 16:28:32 -0400 |
| commit | 169f238c238363ba0311aeea9ead4553846d6be3 (patch) | |
| tree | 75806760c5717f57496537b2f66f41f5ec2dc569 /src | |
| parent | 63e08f56b889eb56ae555b5e8505187331017ff5 (diff) | |
| parent | 5c0dd1aa908f891c8ad453bdcd70a4f6c51ae4b3 (diff) | |
| download | tor-169f238c238363ba0311aeea9ead4553846d6be3.tar.gz tor-169f238c238363ba0311aeea9ead4553846d6be3.zip | |
Merge remote-tracking branch 'onionk/protover-rust1'
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/include.am | 2 | ||||
| -rw-r--r-- | src/core/or/protover_rust.c (renamed from src/core/proto/protover_rust.c) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/core/include.am b/src/core/include.am index d042f697b6..2fddffd47e 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -38,6 +38,7 @@ LIBTOR_APP_A_SOURCES = \ src/core/or/onion.c \ src/core/or/policies.c \ src/core/or/protover.c \ + src/core/or/protover_rust.c \ src/core/or/reasons.c \ src/core/or/relay.c \ src/core/or/scheduler.c \ @@ -49,7 +50,6 @@ LIBTOR_APP_A_SOURCES = \ src/core/proto/proto_ext_or.c \ src/core/proto/proto_http.c \ src/core/proto/proto_socks.c \ - src/core/proto/protover_rust.c \ src/feature/api/tor_api.c \ src/feature/client/addressmap.c \ src/feature/client/bridges.c \ diff --git a/src/core/proto/protover_rust.c b/src/core/or/protover_rust.c index dbdd5c8237..dbdd5c8237 100644 --- a/src/core/proto/protover_rust.c +++ b/src/core/or/protover_rust.c |