diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-03-08 16:20:53 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-03-08 16:20:53 -0500 |
| commit | 63651b919183e1b0a126109646030aca975344bd (patch) | |
| tree | 78738a62b5aedd17deffa6d4926b76f536c1198d /changes | |
| parent | cb3c3c63cb5d0ee1a927dd9cc2fc67d3cc7bc88f (diff) | |
| parent | 00446973f25227c0f805b7430e1ede6679e7ed16 (diff) | |
| download | tor-63651b919183e1b0a126109646030aca975344bd.tar tor-63651b919183e1b0a126109646030aca975344bd.tar.gz | |
Merge remote branch 'origin/maint-0.2.2'
Trivial conflicts fixed in or.h
Conflicts:
src/or/or.h
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug2250 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug2250 b/changes/bug2250 new file mode 100644 index 000000000..95eb55d7f --- /dev/null +++ b/changes/bug2250 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix an assert that got triggered when using the TestingTorNetwork + configuration option and then issuing a GETINFO config-text control + command. Fixes bug 2250; bugfix on 0.2.1.2-alpha. + |