| commit | 400df18688e3b657852a9007151aaf26febe29a6 | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Thu, 7 Jan 2016 17:14:05 +0000 (7 09:14 -0800) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Thu, 7 Jan 2016 17:14:05 +0000 (7 09:14 -0800) | ||
| tree | 11025596266c9fcfdaf7e6ae310f7958f5e9f818 | treesnapshot (tar.gz zip) |
| parent | 1adc2bf66fedb1768c5013dcf5f4778fae453217 | commitdiff |
| parent | ae223138fbdd28ef452191c3a489e25e9a9b22c7 | commitdiff |
Merge branch 'maint-0.2.5' into maint-0.2.6