| commit | 164c8349fb445ecb3dded9547bd61cfbaeaf6ee8 | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Mon, 6 Apr 2015 13:30:54 +0000 (6 09:30 -0400) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Mon, 6 Apr 2015 13:30:54 +0000 (6 09:30 -0400) | ||
| tree | 2fe43ae8d59e048f45e8a553d07ca5c120eb1d6e | treesnapshot (tar.gz zip) |
| parent | b3f24b5de37299d0db87ad8dd2138615ded94e66 | commitdiff |
| parent | 047555214056da24d682d47562a88e53563e49ff | commitdiff |
Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6