commit 9545569d73787211bf11355fe646e8918bdd19f0 Merge: c6ac752 7e1289b Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 23 11:32:22 2014 -0500

Merge branch 'ticket11016'

changes/ticket11016 | 6 ++++++ configure.ac | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++- src/or/include.am | 4 ++-- src/or/main.c | 42 +++++++++++++++++++++++++++++++++++++++ src/test/include.am | 6 ++++-- 5 files changed, 108 insertions(+), 5 deletions(-)