commit 0efa2821c7e1865d8f515df735fd8ad0db5ff467 Merge: 9bd7701 68ed487 Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 24 13:06:55 2014 -0500

Merge branch 'bug11047'

changes/bug11047 | 9 +++++++++ configure.ac | 7 +++++++ 2 files changed, 16 insertions(+)