commit ad1e8b45df3933e6f01098a5f9ba6238adafc9c2 Merge: e968440 30fe908 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Sep 6 11:05:16 2012 -0400 Merge branch 'bug6778' changes/bug6778 | 6 ++++++ src/common/include.am | 12 +++++++----- src/or/include.am | 15 ++++++++------- 3 files changed, 21 insertions(+), 12 deletions(-)