diff options
| author | Roger Dingledine <arma@torproject.org> | 2014-07-28 04:14:39 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2014-07-28 04:14:39 -0400 |
| commit | e3f4a96528ad52c480a360bf7782446f5a06f622 (patch) | |
| tree | 83d14eff564483779dce69244f8a64891cca39e4 /ReleaseNotes | |
| parent | 6c4a26b8ca3d8f61f55ad63baea2090e44fbc126 (diff) | |
| parent | 77609161f37dc37420f240410f2f546fc431cb8c (diff) | |
| download | tor-e3f4a96528ad52c480a360bf7782446f5a06f622.tar.gz tor-e3f4a96528ad52c480a360bf7782446f5a06f622.zip | |
Merge branch 'maint-0.2.5'
Conflicts:
configure.ac
contrib/win32build/tor-mingw.nsi.in
src/win32/orconfig.h
Diffstat (limited to 'ReleaseNotes')
0 files changed, 0 insertions, 0 deletions