diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-04-01 00:46:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-04-01 00:46:52 -0400 |
| commit | 341c6a59db09a43ee2301a6c59158b09ec55134b (patch) | |
| tree | 064d7997faa86393decb522b2c6267003c195d5c /changes/bug3369 | |
| parent | 458718d4975661831fa21d9f2653932e17c1bae0 (diff) | |
| parent | 9a69c24150965e54322ed9616638d4f1939b1289 (diff) | |
| download | tor-341c6a59db09a43ee2301a6c59158b09ec55134b.tar tor-341c6a59db09a43ee2301a6c59158b09ec55134b.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/config.c
Conflict was in or_options_free, where two newly added fields had free
calls in the same place.
Diffstat (limited to 'changes/bug3369')
0 files changed, 0 insertions, 0 deletions