| commit | a45526c230d91e037438566287fd212fa4510480 | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Tue, 19 May 2015 18:49:54 +0000 (19 14:49 -0400) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Tue, 19 May 2015 18:49:54 +0000 (19 14:49 -0400) | ||
| tree | 01ca03b2e79e02e8e7aad337aeeb111f7e3672ec | treesnapshot (tar.gz zip) |
| parent | e1366d907a81796ad985dc5d50c533e24c26528a | commitdiff |
| parent | b3a225fb13d57125888bc6e2c84bdca9abce00f6 | commitdiff |
Merge branch 'maint-0.2.6' into release-0.2.6
Conflicts:
configure.ac
contrib/win32build/tor-mingw.nsi.in
src/win32/orconfig.h
Conflicts:
configure.ac
contrib/win32build/tor-mingw.nsi.in
src/win32/orconfig.h
| src/win32/orconfig.h | diff1 | diff2 | blobhistory |