summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-04-06 16:18:47 -0400
committerNick Mathewson <nickm@torproject.org>2018-04-06 16:18:47 -0400
commitfb2fe41f6f5640c6bb98b0ef4242b1225c312f25 (patch)
tree391a40b11b30b15b02edaf68bafa5509dca545b0
parent98b694bfd5a8577949a48b09cc995a2ea73bb884 (diff)
parent306563ac68250872791350bda1ba7a7acff5eb63 (diff)
downloadtor-fb2fe41f6f5640c6bb98b0ef4242b1225c312f25.tar.xz
tor-fb2fe41f6f5640c6bb98b0ef4242b1225c312f25.zip
Merge branch 'maint-0.3.3'
-rw-r--r--changes/bug257324
-rw-r--r--src/rust/include.am5
2 files changed, 8 insertions, 1 deletions
diff --git a/changes/bug25732 b/changes/bug25732
new file mode 100644
index 000000000..49ffae29e
--- /dev/null
+++ b/changes/bug25732
@@ -0,0 +1,4 @@
+ o Minor bugfixes (distribution, compilation):
+ - Actually include all of our Rust source in our source
+ distributions. (Previously, a few of the files were accidentally
+ omitted.) Fixes bug 25732; bugfix on 0.3.3.2-alpha.
diff --git a/src/rust/include.am b/src/rust/include.am
index 9c4337484..7a0181e37 100644
--- a/src/rust/include.am
+++ b/src/rust/include.am
@@ -8,6 +8,8 @@ EXTRA_DIST +=\
src/rust/external/external.rs \
src/rust/external/lib.rs \
src/rust/protover/Cargo.toml \
+ src/rust/protover/errors.rs \
+ src/rust/protover/protoset.rs \
src/rust/protover/ffi.rs \
src/rust/protover/lib.rs \
src/rust/protover/protover.rs \
@@ -23,4 +25,5 @@ EXTRA_DIST +=\
src/rust/tor_rust/lib.rs \
src/rust/tor_util/Cargo.toml \
src/rust/tor_util/ffi.rs \
- src/rust/tor_util/lib.rs
+ src/rust/tor_util/lib.rs \
+ src/rust/tor_util/strings.rs