commit 4ebad0d947cbb74b674468e6601894468629f814 Merge: f82e499 91f6a42 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 31 10:52:09 2014 -0400 Merge remote-tracking branch 'public/build_torrify_manpage_again' changes/bug11321 | 5 +++++ doc/include.am | 22 ++++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-)