From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 21 Sep 2017 18:39:17 +0000 (-0400)
Subject: Merge branch 'maint-0.3.1'
X-Git-Tag: tor-0.3.2.2-alpha~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c92ecac8bbac1d3bb1961f4210129011ce910c7d;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.1'
---

c92ecac8bbac1d3bb1961f4210129011ce910c7d
diff --cc changes/bug23610
index 3d868524e2,f2dc8bd1a6..20852a698b
--- a/changes/bug23610
+++ b/changes/bug23610
@@@ -1,4 -1,4 +1,5 @@@
    o Minor bugfixes (hidden service, relay):
      - Avoid a possible double close of a circuit by the intro point on error
-       of sending the INTRO_ESTABLISHED cell. Fixes ticket 23610.; bugfix on
-       0.3.2.1-alpha.
+       of sending the INTRO_ESTABLISHED cell. Fixes ticket 23610; bugfix on
+       0.3.0.1-alpha.
++