]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'bug18977_024_v2' into bug18977_026_v2
authorNick Mathewson <nickm@torproject.org>
Thu, 12 May 2016 18:39:06 +0000 (14:39 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 12 May 2016 18:39:06 +0000 (14:39 -0400)
commit20b01cece8cd2ceb7f8051aee04294bdba471f1a
tree49af27aa7e343dce9e05507cee1b00c063e07a02
parent0b477bfd55b16d04ddd97cec09ec978e2a57ba3b
parente57f26c135b03f5dbde77aea24551b6a9fc20889
Merge branch 'bug18977_024_v2' into bug18977_026_v2

Had conflicts related to other correct_tm bugs in 0.2.6.  Added wday
for another case.
src/common/compat.c
src/common/util.c