[tor-commits] [tor/master] Merge remote-tracking branch 'rl1987/bug13228'

[nickm at torproject.org]

commit 56f92ca02d2fb972bc476f235a545b3dc764f58d
Merge: b45bfba f20c72f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 29 08:55:17 2014 -0400

    Merge remote-tracking branch 'rl1987/bug13228'

 changes/bug13228 |    5 +++++
 configure.ac     |    4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)