Commit 0a051ef93cb869111cb470daa90451f387f7da8c

Nick Mathewson 2013-09-16T12:29:48

Merge remote-tracking branch 'rosslagerwall/tree-build'