summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-04-24 08:51:55 -0400
committerNick Mathewson <nickm@torproject.org>2018-04-24 08:51:55 -0400
commit6182f60f758f85a214a7e84d76f6fddb2bffd730 (patch)
treee7e177590a44a782a373bfbb15348741a5ed1539 /changes
parente8683bcbb19318fcd9df04464296d6581adc959d (diff)
parentd2951b381bcbd45798b6cf8f01c5ce7a4d9ad4b9 (diff)
downloadtor-6182f60f758f85a214a7e84d76f6fddb2bffd730.tar.gz
tor-6182f60f758f85a214a7e84d76f6fddb2bffd730.zip
Merge branch 'maint-0.3.2' into maint-0.3.3
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.
+