[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

[teor at torproject.org]

commit f89eb4a021aa082f4385e6d912aaaac07c8f88ac
Merge: 46b027b8b 7786198ee
Author: teor <teor at torproject.org>
Date:   Fri Mar 1 14:15:30 2019 +1000

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug24903     | 5 +++++
 changes/bug25113     | 5 +++++
 changes/bug25116     | 4 ++++
 src/or/circuituse.c  | 6 +++---
 src/or/control.c     | 3 +++
 src/test/test_util.c | 8 ++++----
 6 files changed, 24 insertions(+), 7 deletions(-)