[tor-commits] [tor/master] Merge branch 'bug22779_031'

[nickm at torproject.org]

commit f4f828640f25d73e9a29c3d901af4ab594de0d56
Merge: 53c82c082 df3bdc6bd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 24 09:18:39 2017 -0400

    Merge branch 'bug22779_031'

 changes/bug22779      | 4 ++++
 src/or/circuitbuild.c | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)