[tor-commits] [tor/master] Merge remote-tracking branch 'sebastian/bug14819'

[nickm at torproject.org]

commit 37c9c268c8f5b76c955fe7b450b48623cf744dd3
Merge: 5c820de 353d2fe
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 11 08:40:48 2015 -0500

    Merge remote-tracking branch 'sebastian/bug14819'

 changes/bug14819 |    5 +++++
 configure.ac     |   21 ++-------------------
 2 files changed, 7 insertions(+), 19 deletions(-)