diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-10-31 14:08:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-10-31 14:08:57 -0400 |
| commit | 8676a08362a192f17f2850359b16933c2a5786dd (patch) | |
| tree | 717d5e656824d14e9ad994e586a99fca6e65a180 | |
| parent | 61029d69269d58e530028ee69b148581d3d8bd93 (diff) | |
| parent | db2c2a69091724037e0e6dd0c58f0b18558ce437 (diff) | |
| download | tor-8676a08362a192f17f2850359b16933c2a5786dd.tar tor-8676a08362a192f17f2850359b16933c2a5786dd.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Do an "ours" merge to not take the 0.2.4 fix for #9731
0 files changed, 0 insertions, 0 deletions