[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug12693_025'

[nickm at torproject.org]

commit e6150c7fc079d7841bedd0df838b29aef0f497d7
Merge: 2b3822d 883dc33
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 22 14:45:38 2014 -0400

    Merge remote-tracking branch 'public/bug12693_025'

 changes/bug12693 |    3 +++
 configure.ac     |    3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)