[tor-commits] [tor/master] Merge branch 'bug18240_squashed'

[nickm at torproject.org]

commit c9081bdb74a459f5cf4d6a03ec6619b1bd5e89e8
Merge: b72aa18 a57ed38
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 2 13:53:37 2016 -0400

    Merge branch 'bug18240_squashed'

 Makefile.am      | 16 ++++++++--------
 changes/bug18240 |  5 +++++
 2 files changed, 13 insertions(+), 8 deletions(-)