summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-08-01 13:48:58 -0400
committerNick Mathewson <nickm@torproject.org>2019-08-01 13:48:58 -0400
commit49c696fb4683c46be8e957900b6a95f95e422a4e (patch)
tree0bb261d50abfb6d4d4fdb96e54428236eab0f3c9
parente57209dc32996d27fa058125d43391b2bd423826 (diff)
parent394528241947800a0ac881b8890e5af387e0e9d7 (diff)
downloadtor-49c696fb4683c46be8e957900b6a95f95e422a4e.tar.gz
tor-49c696fb4683c46be8e957900b6a95f95e422a4e.zip
Merge branch 'ticket31311_041' into ticket31304
-rw-r--r--Makefile.am9
-rw-r--r--changes/ticket313113
2 files changed, 9 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 8eeba5edb7..9d3fd97f60 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -167,9 +167,12 @@ EXTRA_DIST+= \
README \
ReleaseNotes \
scripts/maint/checkIncludes.py \
- scripts/maint/checkSpace.pl \
- scripts/maint/practracker
-
+ scripts/maint/checkSpace.pl \
+ scripts/maint/practracker/exceptions.txt \
+ scripts/maint/practracker/metrics.py \
+ scripts/maint/practracker/practracker.py \
+ scripts/maint/practracker/problem.py \
+ scripts/maint/practracker/util.py
## This tells etags how to find mockable function definitions.
AM_ETAGSFLAGS=--regex='{c}/MOCK_IMPL([^,]+,\W*\([a-zA-Z0-9_]+\)\W*,/\1/s'
diff --git a/changes/ticket31311 b/changes/ticket31311
new file mode 100644
index 0000000000..88dfb85736
--- /dev/null
+++ b/changes/ticket31311
@@ -0,0 +1,3 @@
+ o Minor bugfixes (distribution):
+ - Do not ship any temporary files found in the scripts/maint/practracker
+ directory. Fixes bug 31311; bugfix on 0.4.1.1-alpha.