Merge remote-tracking branch 'rosslagerwall/tree-build'
authorNick Mathewson <nickm@torproject.org>
Mon, 16 Sep 2013 16:29:48 +0000 (12:29 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 16 Sep 2013 16:29:48 +0000 (12:29 -0400)

Trivial merge