merge of '8a3fab47a669f61548d9807e8e047b19248a23ab'

and 'a3189032197fadc3ecba67c5568b8841e8a6105e'
2009-07-07 00:04:03 +00:00
parent 6c7f1cbf8a 43d6851199
commit 4b1eabf1fc
210 changed files with 532 additions and 419 deletions
--- a/apps/routerconsole/jsp/configkeyring.jsp
+++ b/apps/routerconsole/jsp/configkeyring.jsp
@ -43,7 +43,7 @@
 <p>
 <table>
 <tr><td>Dest. name, hash, or full key:
- <td><textarea name="peer" cols="44" rows="1" wrap="off"></textarea>
+ <td><textarea name="peer" cols="44" rows="1" style="height: 3em;" wrap="off"></textarea>
 <tr><td align="right">Session Key:
 <td><input type="text" size="55" name="key" />
 <tr><td><td><input type="submit" name="action" value="Add key" />