summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-04-24 08:49:20 -0400
committerNick Mathewson <nickm@torproject.org>2018-04-24 08:49:20 -0400
commite8886340762cbe3be306268dfe0003214b09ac07 (patch)
tree3e6c4900586be15735900b49171bfc5111588b20 /changes
parent5c3639923fb3d7a1bfc7b38248001e67333fa35e (diff)
parentc3e40a83618c91fe7ef004577b0cb140ac83e3d9 (diff)
downloadtor-e8886340762cbe3be306268dfe0003214b09ac07.tar.gz
tor-e8886340762cbe3be306268dfe0003214b09ac07.zip
Merge remote-tracking branch 'public/bug23693_031_redux' into maint-0.3.1
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.
+