commit 41782bf3ac0ce1d2b3363585e652dfe944a9a58e Merge: 20ec030 c44a946 Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 6 10:57:31 2015 -0400

Merge remote-tracking branch 'tvdw/fix-16563'

src/common/torlog.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)