[tor-commits] [tor/release-0.2.8] Merge remote-tracking branch 'arma/bug19003-try2' into maint-0.2.8

commit ce6f2d1c4da5125cdd4a69fcc4cd45f7c3d6ca8d Merge: d00d3f1 b8b5bcc Author: Nick Mathewson <nickm@torproject.org> Date: Thu May 12 11:09:33 2016 -0400 Merge remote-tracking branch 'arma/bug19003-try2' into maint-0.2.8 changes/bug19003 | 5 +++++ src/or/circuituse.c | 6 +++++- src/or/router.c | 15 ++++++++++++--- 3 files changed, 22 insertions(+), 4 deletions(-)