]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c06a80 b99457d)
Merge remote-tracking branch 'origin/maint-0.2.3'
authorNick Mathewson <nickm@torproject.org>
Wed, 24 Oct 2012 01:50:43 +0000 (21:50 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 24 Oct 2012 01:50:43 +0000 (21:50 -0400)
This is an "ours" merge; we want a separate fix for this bug (bug7191)
in master. Rather than catching the two failing cases, we need to make
them not fail.


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