Merge remote-tracking branch 'tor-github/pr/781'

torproject · Mar 19, 2019 · 2a49b27 · 2a49b27
2 parents a801317 + 34b562b
commit 2a49b27
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 193 deletions.
diff --git a/changes/ticket29434 b/changes/ticket29434
@@ -0,0 +1,3 @@
+  o Removed features:
+    - Remove linux-tor-prio.sh script from contrib/operator-tools directory.
+      Resolves issue 29434.
diff --git a/contrib/include.am b/contrib/include.am
@@ -7,7 +7,6 @@ EXTRA_DIST+= \
 	contrib/dist/tor.sh				\
 	contrib/dist/torctl				\
 	contrib/dist/tor.service.in			\
-	contrib/operator-tools/linux-tor-prio.sh	\
 	contrib/operator-tools/tor-exit-notice.html	\
 	contrib/or-tools/exitlist			\
 	contrib/win32build/tor-mingw.nsi.in		\

diff --git a/contrib/operator-tools/linux-tor-prio.sh b/contrib/operator-tools/linux-tor-prio.sh