diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-12-07 14:12:17 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-12-07 14:12:17 -0500 |
| commit | 3fa9151f2610fdad23df02b2b914881286b22480 (patch) | |
| tree | ef9f91dfb3c886a59cc591739dc7ddb6f8a703a5 /changes | |
| parent | cd4f56a37c3513cdca3463c3638067380af29219 (diff) | |
| parent | 4458fd0cd8fa259f0ee8195e1aa86d5b7c6f8919 (diff) | |
| download | tor-3fa9151f2610fdad23df02b2b914881286b22480.tar.gz tor-3fa9151f2610fdad23df02b2b914881286b22480.zip | |
Merge branch 'win64-7260'
Conflicts:
src/or/dns.c
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug7260 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/changes/bug7260 b/changes/bug7260 new file mode 100644 index 0000000000..8eb54c381a --- /dev/null +++ b/changes/bug7260 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Compile on win64 using mingw64. Fixes bug 7260; patches from "yayooo". + |