aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2019-02-20 10:36:54 -0500
committerRoger Dingledine <arma@torproject.org>2019-02-20 10:36:54 -0500
commit4d4eda89a1d0f3b19b408349d602bf7ba47e1cdb (patch)
treef8603e1135590293e152f112f43b2cfec0f2ff96 /changes
parent6927e9a60ca12fa67d6a33044c2903ce95ca1605 (diff)
parentccab4347e592116fcbc0faa42dcfaf7eaa6fe715 (diff)
downloadtor-4d4eda89a1d0f3b19b408349d602bf7ba47e1cdb.tar.gz
tor-4d4eda89a1d0f3b19b408349d602bf7ba47e1cdb.zip
Merge branch 'maint-0.4.0'
Diffstat (limited to 'changes')
-rw-r--r--changes/ticket286142
-rw-r--r--changes/ticket290722
2 files changed, 3 insertions, 1 deletions
diff --git a/changes/ticket28614 b/changes/ticket28614
index 6c65ce49de..3c93313726 100644
--- a/changes/ticket28614
+++ b/changes/ticket28614
@@ -3,6 +3,6 @@
"binary" mode so that we can safely map it into memory later.
Fixes part of bug 28614; bugfix on 0.4.0.1-alpha.
- When reading a consensus file from disk, detect whether it
- was written in text mode, and re-read it in text mode if it
+ was written in text mode, and re-read it in text mode if so.
Fixes part of bug 28614; bugfix on 0.4.0.1-alpha.
diff --git a/changes/ticket29072 b/changes/ticket29072
new file mode 100644
index 0000000000..3526330f30
--- /dev/null
+++ b/changes/ticket29072
@@ -0,0 +1,2 @@
+ o Removed features:
+ - Remove check-tor script from repository. Resolves issue 29072.