[tor-commits] [tor/maint-0.3.1] Merge branch 'bug26158_031' into maint-0.3.1

[nickm at torproject.org]

commit 94f3007627f4161ca4f1fb5e41f11cc8ff78ca2b
Merge: 16381b579 6c35ad08c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 13 09:58:01 2018 -0400

    Merge branch 'bug26158_031' into maint-0.3.1

 changes/bug26158      | 5 +++++
 src/or/circuitbuild.c | 1 +
 2 files changed, 6 insertions(+)