Commit aeb8d345b47bee0522f1ce32a20bfc8a642d657c

Nick Mathewson 2013-12-06T10:37:53

Merge remote-tracking branch 'origin/pr/86'