commit 971eb49caaddbd554127a77577450276c3c1ac39 Merge: 396da92 2a3b01f Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 2 09:21:36 2015 -0400

Merge remote-tracking branch 'teor/fallback-to-python'

chutney | 8 ++++++++ 1 file changed, 8 insertions(+)