commit d83aa8c90ad99bed08691240e7320441b811b2d7 Merge: 9899045 bcbb2d1 Author: Nick Mathewson nickm@torproject.org Date: Sun Jan 22 19:03:25 2017 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

changes/bug20307 | 7 +++++++ src/or/or.h | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-)