| commit | 8f043ffc647bf129e8a6d0c5991586fac880c489 | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Mon, 19 Dec 2016 15:12:34 +0000 (19 10:12 -0500) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Mon, 19 Dec 2016 15:12:34 +0000 (19 10:12 -0500) | ||
| tree | abbeb7c8db93f08728226b7da3123dceeb7cf53c | treesnapshot (tar.gz zip) |
| parent | 24318fbda99d7fb316e1c377fedaeba927102145 | commitdiff |
| parent | f62c74cc7298aa9a7db55f1256754b8e243e3865 | commitdiff |
Merge branch 'maint-0.2.8' into maint-0.2.9
"Ours" merge to avoid version bump.
"Ours" merge to avoid version bump.