aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-04-24 08:49:24 -0400
committerNick Mathewson <nickm@torproject.org>2018-04-24 08:49:24 -0400
commitd2951b381bcbd45798b6cf8f01c5ce7a4d9ad4b9 (patch)
tree3a30b8aa14b3688fbc980ae54821824b1dd820ac /changes
parent1438c6c7134c53b2aa3b5e9abf94fe12a4d9bd5e (diff)
parente8886340762cbe3be306268dfe0003214b09ac07 (diff)
downloadtor-d2951b381bcbd45798b6cf8f01c5ce7a4d9ad4b9.tar.gz
tor-d2951b381bcbd45798b6cf8f01c5ce7a4d9ad4b9.zip
Merge branch 'maint-0.3.1' into maint-0.3.2
Diffstat (limited to 'changes')
-rw-r--r--changes/bug23693.14
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug23693.1 b/changes/bug23693.1
new file mode 100644
index 0000000000..4b16788814
--- /dev/null
+++ b/changes/bug23693.1
@@ -0,0 +1,4 @@
+ o Minor bugfixes (relay, crash):
+ - Avoid a crash when running with DirPort set but ORPort tuned off.
+ Fixes a case of bug 23693; bugfix on 0.3.1.1-alpha.
+