]> git.ipfire.org Git - thirdparty/tor.git/commit
projects / thirdparty / tor.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b482c87 e7d3493)
Merge remote-tracking branch 'public/getfilesize_64'
authorNick Mathewson <nickm@torproject.org>
Tue, 5 Jun 2012 15:10:42 +0000 (11:10 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 5 Jun 2012 15:10:42 +0000 (11:10 -0400)
commitd09a3ecd01330e2ec5da942a0469a37416da75ed
treeff7d33d41388e35867e534741ceb18af505ae55atree | snapshot
parentb482c870ca3d70bc5611b8eb447ebbe3418bf3a9commit | diff
parente7d34935fb3050065cf0d8350b5d75f72c1fe6c4commit | diff
Merge remote-tracking branch 'public/getfilesize_64'

Conflicts:
src/common/compat.c

The getfilesize change conflicted with the removal of file_handle
from the windows tor_mmap_t.
src/common/compat.c diff1 | diff2 | blob | history
Mirror of https://git.torproject.org/tor.git