Merge branch 'master' into no-xmpp

2 files changed, 20 insertions, 0 deletions

diff --git a/doc/bugs/gpg-agent/comment_2_de6f9b8f20e44e93759b9bf0db695def._comment b/doc/bugs/gpg-agent/comment_2_de6f9b8f20e44e93759b9bf0db695def._comment
new file mode 100644
index 000000000..8158500ae
--- /dev/null
+++ b/doc/bugs/gpg-agent/comment_2_de6f9b8f20e44e93759b9bf0db695def._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="https://launchpad.net/~r0lf"
+ nickname="Rolf Leggewie"
+ avatar="http://cdn.libravatar.org/avatar/aa82122557e706df7ba83bd1983eb79ef1ba2e51350217850176d4f9a1bb2bc0"
+ subject="comment 2"
+ date="2016-12-24T17:56:13Z"
+ content="""
+time to trim the list of open bugs and close this ticket as unreproducible?
+"""]]
diff --git a/doc/devblog/day_440__holidaze.mdwn b/doc/devblog/day_440__holidaze.mdwn
new file mode 100644
index 000000000..e002d0d15
--- /dev/null
+++ b/doc/devblog/day_440__holidaze.mdwn
@@ -0,0 +1,11 @@
+Have been working on some improvements to `git annex enable-tor`. Made it
+su to root, using any su-like program that's available. And made it test
+the hidden service it sets up, and wait until it's propigated the the Tor
+directory authorities. The webapp will need these features, so I thought I
+might as well add them at the command-line level.
+
+Also some messing about with locale and encoding issues. About most of
+which the less said the better. One significant thing is that I've made the
+filesystem encoding be used for all IO by git-annex, rather than needing to
+explicitly enable it for each file and process. So, there should be much
+less bother with encoding problems going forward.