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

[nickm at torproject.org]

commit cbdb3c92f58c4ab1f80542d8e2c1b54557db29dc
Merge: 14edb0b ef53526
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Dec 11 22:23:31 2016 -0500

    Merge branch 'maint-0.2.9'

 changes/bug20935 | 3 +++
 configure.ac     | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)