Merge branch 'maint-0.3.1'

diff --cc changes/bug23610
index 3d868524e26ec5a96107ee30477bdabd92834d2d,f2dc8bd1a611df168350d2fc4ac70f1eb37fe811..20852a698b7092b937a2e7bfebeeb2b367f9973c
--- 1/changes/bug23610
--- 2/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.
++