diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-10-23 21:50:43 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-10-23 21:50:43 -0400 |
| commit | 9064238495151915699fa50c437722f236b877fc (patch) | |
| tree | c1226efd3cf7a20dada89aa76f57b8f5fee4d4d5 | |
| parent | 4c06a804d946de238e2d6a0b1a7dd655b0d82ccc (diff) | |
| parent | b99457d4295b2329e65f3e01b24b57d5c78ca017 (diff) | |
| download | tor-9064238495151915699fa50c437722f236b877fc.tar.gz tor-9064238495151915699fa50c437722f236b877fc.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3'
This is an "ours" merge; we want a separate fix for this bug (bug7191)
in master. Rather than catching the two failing cases, we need to make
them not fail.
0 files changed, 0 insertions, 0 deletions