Merge branch 'doc13702_squashed'
commite00503fe57e5459c6df57d993f3b3290e97262d9
authorNick Mathewson <nickm@torproject.org>
Tue, 27 Jan 2015 17:42:12 +0000 (27 12:42 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 27 Jan 2015 17:42:12 +0000 (27 12:42 -0500)
treecaa90066545f2cb0cc298ee9f613bd0cfcce3b9c
parenta598d0f575afab3836a48c9efc9f59e2bd5beab1
parentd7ac4d913019345884c548dfd05f8bdffcee9d16
Merge branch 'doc13702_squashed'