commit 0e0a16774261cf2f9f98ffe42ccd8aefe3a36a95 Merge: f612a9e a78eeb4 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Sep 19 09:01:15 2012 -0400 Merge branch 'bug6843' changes/bug6843 | 5 +++++ doc/include.am | 30 ++++++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 4 deletions(-)