commit d2cd0dfd14e834fe24bd223d083b5daa7d02d9bf Merge: e1d3b44 34ad764 Author: Nick Mathewson nickm@torproject.org Date: Fri Jul 19 11:58:20 2013 -0400

Merge branch 'bug9296'

src/or/circuitmux.c | 1 + src/test/include.am | 1 + src/test/test.c | 2 ++ 3 files changed, 4 insertions(+)