]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c5a44e d98f299)
Merge (with -s ours) remote-tracking branch 'origin/maint-0.2.3'
authorNick Mathewson <nickm@torproject.org>
Mon, 27 Aug 2012 20:21:10 +0000 (16:21 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 27 Aug 2012 20:21:10 +0000 (16:21 -0400)
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.


Trivial merge
Mirror of https://git.torproject.org/tor.git