diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-08-27 16:21:10 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-08-27 16:21:10 -0400 |
| commit | 2776a6b8103e745a9be8fc181a2b10273289a5e1 (patch) | |
| tree | 89f4945bd65bc06450b95131cfcf04b6da54fd5d | |
| parent | 0c5a44ed0a790951bdfd319eec734c04eb972a08 (diff) | |
| parent | d98f2996b0b7b8629ac05662976cb3e4f100efcd (diff) | |
| download | tor-2776a6b8103e745a9be8fc181a2b10273289a5e1.tar.gz tor-2776a6b8103e745a9be8fc181a2b10273289a5e1.zip | |
Merge (with -s ours) remote-tracking branch 'origin/maint-0.2.3'
We are doing this merge to avoid taking the patch from
"nickm/disable_pathbias_warnings_v2" into 0.2.4 -- we're going to try
to fix the pathbias code for real here.
0 files changed, 0 insertions, 0 deletions