[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

[nickm at torproject.org]

commit c92ecac8bbac1d3bb1961f4210129011ce910c7d
Merge: 6045bdd4a 7f3dc8327
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 21 14:39:17 2017 -0400

    Merge branch 'maint-0.3.1'

 changes/bug23610 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --cc changes/bug23610
index 3d868524e,f2dc8bd1a..20852a698
--- 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.
++