| commit | 74f861b295fc59ae2567b5ec78e2a46d66e44630 | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Tue, 10 Mar 2015 12:21:53 +0000 (10 08:21 -0400) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Tue, 10 Mar 2015 12:21:53 +0000 (10 08:21 -0400) | ||
| tree | a07d40d58f189fd3b10af049613820c7b5c6ee9d | treesnapshot (tar.gz zip) |
| parent | 0c2e4aec7b8b2024a93c2ee5a7d97bdc45501f70 | commitdiff |
| parent | 99b59dee7046b04854ac263a1cf810dceb80df12 | 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