commit 70ce8f9198c57b3652de88f8884d8d3e38d0df17 Merge: c68d6fb ddf945f Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 11 10:32:59 2012 -0400

Merge remote-tracking branch 'mikeperry/path-bias-tuning'

proposals/xxx-path-bias-tuning.txt | 200 ++++++++++++++++++++++++++++++++++++ 1 files changed, 200 insertions(+), 0 deletions(-)