]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c6e1080 5e9bd1b)
Merge remote-tracking branch 'karsten/bug11683'
authorNick Mathewson <nickm@torproject.org>
Thu, 19 Jun 2014 14:42:19 +0000 (10:42 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 19 Jun 2014 14:42:19 +0000 (10:42 -0400)
1  2 
src/or/directory.c patch | diff1 | diff2 | blob | history

diff --cc src/or/directory.c
Simple merge
Mirror of https://git.torproject.org/tor.git