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

[nickm at torproject.org]

commit 5032489e80af7236dd571da34cb659ab5fc7ccd6
Merge: b4c648c cf2f36b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 5 08:21:40 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/20492     | 4 ++++
 src/or/include.am | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)