commit 9e80fc817198a982ba92484e6e5f1932391e8412 Merge: 25c3ff4 1a50cb8 Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 24 15:16:49 2015 -0400

Merge remote-tracking branch 'sebastian/coverage_builds'

.gitignore | 4 ++++ Makefile.am | 22 ++++++++++++++++++++++ changes/coverage | 6 ++++++ src/common/aes.c | 2 +- src/common/include.am | 6 +++--- src/common/util.h | 8 ++++++++ src/or/connection.c | 2 +- src/or/include.am | 4 ++-- src/test/include.am | 4 ++-- src/test/test-network.sh | 2 +- src/tools/include.am | 28 ++++++++++++++++++++++++++-- src/trunnel/include.am | 2 +- 12 files changed, 77 insertions(+), 13 deletions(-)