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

[nickm at torproject.org]

commit 58e0e587a6e0ddb04a8fa6a58852d843b1c21a2c
Merge: f936f18 ce6f2d1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 12 11:09:40 2016 -0400

    Merge branch 'maint-0.2.8'

 changes/bug19003    |  5 +++++
 src/or/circuituse.c |  6 +++++-
 src/or/router.c     | 15 ++++++++++++---
 3 files changed, 22 insertions(+), 4 deletions(-)