commit 79f488c32c43562522e5592f2c19952dc7681a65 Merge: e70357b 3c56887 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 17 21:00:20 2012 -0400

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

proposals/209-path-bias-tuning.txt | 33 ++++++++++++++++++++++----------- 1 files changed, 22 insertions(+), 11 deletions(-)