Merge commit 'mikeperry/bandwidth-voting-final'

diff --cc src/or/config.c
Simple merge

diff --cc src/or/dirserv.c
Simple merge

diff --cc src/or/or.h
Simple merge

diff --cc src/or/test.c
Simple merge